[Python-modules-commits] [python-pip] 03/04: merge patched-dirtbike into dirtbike

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch dirtbike
in repository python-pip.

commit 27a41be6fa6ff838467bd477c235eaad3644dc2b
Merge: f8688be 0cfc43d
Author: Barry Warsaw <barry at python.org>
Date:   Fri Dec 11 17:14:30 2015 -0500

    merge patched-dirtbike into dirtbike

 debian/.git-dpm                    |  4 ++--
 debian/patches/fix-wheel-dir.patch | 23 +++++++++++++++++++++++
 debian/patches/series              |  1 +
 pip/__init__.py                    |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ffbbed4,0000000..e72b8f9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0ddf5c266e00c9cd5b02f0ae31939f5200c57e6d
- 0ddf5c266e00c9cd5b02f0ae31939f5200c57e6d
++0cfc43d1b6b2e70ae1553682a47e29986f626c89
++0cfc43d1b6b2e70ae1553682a47e29986f626c89
 +3be157ea672de9d85e0e888ac4080ebe66fb4782
 +3be157ea672de9d85e0e888ac4080ebe66fb4782
 +python-pip_7.1.2.orig.tar.gz
 +9eb9ea19b630412bc2b2b587fc6bbbee71950a96
 +1049170
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix-wheel-dir.patch
index 0000000,0000000..e0df2f1
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-wheel-dir.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 0cfc43d1b6b2e70ae1553682a47e29986f626c89 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 11 Dec 2015 17:13:48 -0500
++Subject: Update the wheel directory when outside a virtualenv.
++
++Patch-Name: fix-wheel-dir.patch
++---
++ pip/__init__.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pip/__init__.py b/pip/__init__.py
++index f48172b..b654adf 100755
++--- a/pip/__init__.py
+++++ b/pip/__init__.py
++@@ -58,7 +58,7 @@ else:
++ if in_venv:
++     wheel_dir = os.path.join(sys.prefix, 'lib', 'python-wheels')
++ else:
++-    wheel_dir = '/usr/share/python-wheels'
+++    wheel_dir = '/usr/share/python-pip-common/wheels'
++ 
++ # We'll add all the wheels we find to the front of sys.path so that they're
++ # found first, even if the same dependencies are available in site-packages.
diff --cc debian/patches/series
index ebeddd0,0000000..ce46624
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +use-wheels.patch
 +hands-off-system-packages.patch
 +enable-debundling.patch
++fix-wheel-dir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pip.git