[Python-modules-commits] r29312 - in packages/python-virtualenv/trunk/debian (2 files)

[barry at users.alioth.debian.org]

    Date: Thursday, June 12, 2014 @ 14:49:51
  Author: barry
Revision: 29312

d/patches/use-wheels.patch: Ignore EEXIST when creating the
<venv>/lib/python-wheels directory.

Modified:
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/patches/use-wheels.patch

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2014-06-11 23:05:17 UTC (rev 29311)
+++ packages/python-virtualenv/trunk/debian/changelog	2014-06-12 14:49:51 UTC (rev 29312)
@@ -1,3 +1,10 @@
+python-virtualenv (1.11.6-2) UNRELEASED; urgency=medium
+
+  * d/patches/use-wheels.patch: Ignore EEXIST when creating the
+    <venv>/lib/python-wheels directory.
+
+ -- Barry Warsaw <barry at debian.org>  Thu, 12 Jun 2014 10:45:43 -0400
+
 python-virtualenv (1.11.6-1) unstable; urgency=medium
 
   * Team upload.

Modified: packages/python-virtualenv/trunk/debian/patches/use-wheels.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/use-wheels.patch	2014-06-11 23:05:17 UTC (rev 29311)
+++ packages/python-virtualenv/trunk/debian/patches/use-wheels.patch	2014-06-12 14:49:51 UTC (rev 29312)
@@ -73,7 +73,7 @@
      try:
          proc = subprocess.Popen(
              cmd, stderr=subprocess.STDOUT, stdin=None, stdout=stdout,
-@@ -985,6 +999,25 @@
+@@ -985,6 +999,31 @@
  
      install_distutils(home_dir)
  
@@ -81,7 +81,13 @@
 +    # Copy system wheels into the venv directory where our hacked pip will
 +    # search, i.e. <venv>/lib/python-wheels.
 +    destdir = os.path.join(home_dir, 'lib', 'python-wheels')
-+    os.makedirs(destdir)
++    try:
++        # The directory could exist.  Because this code may run under Python
++        # 2, we can't use `exist_ok=True`.  Catch and ignore the old way.
++        os.makedirs(destdir)
++    except OSError as error:
++        if error.errno != errno.EEXIST:
++            raise
 +    for project in DEBIAN_WHEEL_DEPS:
 +        wheel_names = glob.glob(
 +            '/usr/share/python-wheels/{}-*.whl'.format(project))