Skip to content

Commit

Permalink
debian: move ceph_argparse into ceph-common
Browse files Browse the repository at this point in the history
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",
2a23eac)

http://tracker.ceph.com/issues/11388 Refs: #11388

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 110608e)

Conflicts:
	debian/ceph.install
            There is no ceph_daemon.py in hammer
  • Loading branch information
ktdreyer authored and smithfarm committed Jul 19, 2015
1 parent 9a79e8e commit 8766bdc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions debian/ceph-common.install
Expand Up @@ -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*
1 change: 0 additions & 1 deletion debian/ceph.install
Expand Up @@ -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*
6 changes: 3 additions & 3 deletions debian/control
Expand Up @@ -60,7 +60,7 @@ Standards-Version: 3.9.3
Package: ceph
Architecture: linux-any
Depends: binutils,
ceph-common (>= 0.78-500),
ceph-common (>= 0.94.2),
cryptsetup-bin | cryptsetup,
gdisk,
parted,
Expand Down Expand Up @@ -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 (<< 0.94.2),
python-ceph (<< 0.92-1223),
librbd1 (<< 0.92-1238)
Breaks: ceph (<< 0.78-500),
Breaks: ceph (<< 0.94.2),
python-ceph (<< 0.92-1223),
librbd1 (<< 0.92-1238)
Suggests: ceph, ceph-mds
Expand Down

0 comments on commit 8766bdc

Please sign in to comment.