[Python-modules-team] Bug#834193: python-pip: pip2 is not the same as pip: makepip missing for pip2

[Daniel Hahler]

Package: python-pip
Version: 8.1.1-2ubuntu0.1
Severity: important

Dear Maintainer,

debian/rules uses the "makepip.py" program to generate fixed/custom pip
and pip3 scripts, but leaves the original pip2 alone:

override_dh_python3:
        dh_python3
        rm -f debian/python3-pip/usr/bin/pip
        rm -f debian/python3-pip/usr/bin/pip3.?
        rm -rf debian/python3-pip/usr/lib/python3.?
        python3 debian/makepip.py /usr/bin/python3 \
                debian/python3-pip/usr/bin/pip3

override_dh_python2:
        dh_python2
        rm -f debian/python-pip/usr/bin/pip2.?
        python3 debian/makepip.py /usr/bin/python \
                debian/python-pip/usr/bin/pip

% diff -u /usr/bin/pip*
--- /usr/bin/pip 2016-05-24 14:23:26.000000000 +0000
+++ /usr/bin/pip2 2016-05-24 14:23:16.000000000 +0000
@@ -1,11 +1,10 @@
 #!/usr/bin/python
-# GENERATED BY DEBIAN
-
+# EASY-INSTALL-ENTRY-SCRIPT: 'pip==8.1.1','console_scripts','pip2'
+__requires__ = 'pip==8.1.1'
 import sys
+from pkg_resources import load_entry_point

-# Run the main entry point, similarly to how setuptools does it, but
because
-# we didn't install the actual entry point from setup.py, don't use the
-# pkg_resources API.
-from pip import main
 if __name__ == '__main__':
- sys.exit(main())
+ sys.exit(
+ load_entry_point('pip==8.1.1', 'console_scripts', 'pip2')()
+ )

I think there should be an additional line in override_dh_python2:

 python3 debian/makepip.py /usr/bin/python \
  debian/python-pip/usr/bin/pip2

I've noticed this because Saltstack will prefer "pip2" over "pip".

Reported for Ubuntu on Launchpad in
https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1612264.


-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 4.4.0-34-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages python-pip depends on:
ii  ca-certificates  20160104ubuntu1
ii  python-pip-whl   8.1.1-2ubuntu0.1
pn  python:any       <none>

Versions of packages python-pip recommends:
ii  build-essential    12.1ubuntu2
ii  python-all-dev     2.7.11-1
ii  python-setuptools  20.7.0-1
ii  python-wheel       0.29.0-1

python-pip suggests no packages.

-- no debconf information