]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
debian/control: try installing virtualenv first, if it exists 8285/head
authorDan Mick <dan.mick@redhat.com>
Wed, 23 Mar 2016 22:47:10 +0000 (15:47 -0700)
committerDan Mick <dan.mick@redhat.com>
Thu, 24 Mar 2016 00:38:12 +0000 (17:38 -0700)
Debian Jessie (at least) now has the virtualenv command in
package 'virtualenv', which depends on python3-virtualenv, and
that's how you get the virtualenv command there.  Earlier
Debian-based releases still use python-virtualenv.  Jessie's
virtualenv command still creates a python2 venv by default.

This will require a followup fix for install-deps.sh
to handle the | correctly, because currently it sends
the string to apt-get, which treats it as a regular expression
alternation of the two package names, so will try to install both.

The problem occurs when packages are installed without Recommended
packages (because jessie's virtualenv package currently Recommends
python-virtualenv); this is the case under pbuilder, and also using
'mk-build-deps --install', and I suspect under other automated
package-building tools.

Note that Build-Requires processing is not specified to
perform the searches in left-to-right order, so even this is
a tenuous workaround.  We probably need distro-specific
debian/ directories.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
debian/control

index d28933b901bc0bff2723443f6229ace113ed53d8..3f0f5c2d472527015a2fa7fb28669cda86d66775 100644 (file)
@@ -57,7 +57,7 @@ Build-Depends: autoconf,
                python-nose,
               python-setuptools,
                python-sphinx,
-               python-virtualenv | virtualenv,
+               virtualenv | python-virtualenv,
                sdparm | hdparm,
                uuid-runtime,
                valgrind,