From df2e3f4da3dbba7afb8a05fb80b1c1552515f4ea Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 14 Apr 2015 07:58:17 -0600 Subject: [PATCH] debian: move ceph_argparse into ceph-common Prior to this commit, if a user installed the "ceph-common" Debian package without installing "ceph", then /usr/bin/ceph would crash because it was missing the ceph_argparse library. Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This was the intention of the original commit that moved argparse to "ceph", 2a23eac54957e596d99985bb9e187a668251a9ec) http://tracker.ceph.com/issues/11388 Refs: #11388 Reported-by: Jens Rosenboom Signed-off-by: Ken Dreyer (cherry picked from commit 110608e5bdd9e2f03020ad41f0c2d756684d4417) Conflicts: debian/ceph.install There is no ceph_daemon.py in hammer --- debian/ceph-common.install | 1 + debian/ceph.install | 1 - debian/control | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/ceph-common.install b/debian/ceph-common.install index e1fb65e33ab0e8..4e21adff9c4743 100644 --- a/debian/ceph-common.install +++ b/debian/ceph-common.install @@ -26,3 +26,4 @@ usr/share/ceph/id_dsa_drop.ceph.com.pub etc/ceph/rbdmap etc/init.d/rbdmap lib/udev/rules.d/50-rbd.rules +usr/lib/python*/dist-packages/ceph_argparse.py* diff --git a/debian/ceph.install b/debian/ceph.install index 6a405214ee8f4a..d6d087168ca380 100644 --- a/debian/ceph.install +++ b/debian/ceph.install @@ -34,4 +34,3 @@ usr/share/man/man8/ceph-rest-api.8 usr/share/man/man8/crushtool.8 usr/share/man/man8/monmaptool.8 usr/share/man/man8/osdmaptool.8 -usr/lib/python*/dist-packages/ceph_argparse.py* diff --git a/debian/control b/debian/control index 4f9fc9f8f8abff..1b5d3739e64768 100644 --- a/debian/control +++ b/debian/control @@ -60,7 +60,7 @@ Standards-Version: 3.9.3 Package: ceph Architecture: linux-any Depends: binutils, - ceph-common (>= 0.78-500), + ceph-common (>= 9.0.0-943), cryptsetup-bin | cryptsetup, gdisk, parted, @@ -191,10 +191,10 @@ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, python-requests Conflicts: ceph-client-tools Replaces: ceph-client-tools, - ceph (<< 0.78-500), + ceph (<< 9.0.0-943), python-ceph (<< 0.92-1223), librbd1 (<< 0.92-1238) -Breaks: ceph (<< 0.78-500), +Breaks: ceph (<< 9.0.0-943), python-ceph (<< 0.92-1223), librbd1 (<< 0.92-1238) Suggests: ceph, ceph-mds