From b5e306047fe46a141d22f5c0a624eff2000ce0ce Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 12 Feb 2025 18:10:39 +0900 Subject: [PATCH] dist: fix upgrade error from 2024.1 We need to allow replacing nodetool from scylla-enterprise-tools < 2024.2, just like we did for scylla-tools < 5.5. This is required to make packages able to upgrade from 2024.1. Fixes #22820 Closes scylladb/scylladb#22821 --- dist/debian/control.template | 4 ++-- dist/redhat/scylla.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/debian/control.template b/dist/debian/control.template index 6dd51b90aa..276b9fa6c4 100644 --- a/dist/debian/control.template +++ b/dist/debian/control.template @@ -19,8 +19,8 @@ Breaks: scylla-enterprise-conf (<< 2025.1.0~) Package: %{product}-server Architecture: any Depends: ${misc:Depends}, %{product}-conf (= ${binary:Version}), %{product}-python3 (= ${binary:Version}) -Replaces: %{product}-tools (<<5.5), scylla-enterprise-server (<< 2025.1.0~) -Breaks: %{product}-tools (<<5.5), scylla-enterprise-server (<< 2025.1.0~) +Replaces: %{product}-tools (<<5.5), scylla-enterprise-tools (<< 2024.2.0~), scylla-enterprise-server (<< 2025.1.0~) +Breaks: %{product}-tools (<<5.5), scylla-enterprise-tools (<< 2024.2.0~), scylla-enterprise-server (<< 2025.1.0~) Description: Scylla database server binaries Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB. diff --git a/dist/redhat/scylla.spec b/dist/redhat/scylla.spec index e5b1aa5d1f..8281a21a8e 100644 --- a/dist/redhat/scylla.spec +++ b/dist/redhat/scylla.spec @@ -74,6 +74,8 @@ Requires: %{product}-python3 = %{version}-%{release} AutoReqProv: no Provides: %{product}-tools:%{_bindir}/nodetool Provides: %{product}-tools:%{_sysconfigdir}/bash_completion.d/nodetool-completion +Provides: scylla-enterprise-tools:%{_bindir}/nodetool +Provides: scylla-enterprise-tools:%{_sysconfigdir}/bash_completion.d/nodetool-completion Provides: scylla-enterprise-server = %{version}-%{release} Obsoletes: scylla-enterprise-server < 2025.1.0