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

[warsaw-guest at users.alioth.debian.org]

    Date: Thursday, December 20, 2012 @ 16:28:20
  Author: warsaw-guest
Revision: 23192

Delete multiarch.patch.  Based on bugs #695958 and #695959, I'll do this a
different way.

Modified:
  packages/python-virtualenv/trunk/debian/patches/series
Deleted:
  packages/python-virtualenv/trunk/debian/patches/multiarch.patch

Deleted: packages/python-virtualenv/trunk/debian/patches/multiarch.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/multiarch.patch	2012-12-19 15:05:02 UTC (rev 23191)
+++ packages/python-virtualenv/trunk/debian/patches/multiarch.patch	2012-12-20 16:28:20 UTC (rev 23192)
@@ -1,44 +0,0 @@
-Description: Use system multiarch path if available.
-Author: Barry Warsaw <barry at python.org>
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695707
-Forwarded: no
-
---- a/virtualenv_embedded/site.py
-+++ b/virtualenv_embedded/site.py
-@@ -83,6 +83,22 @@
- USER_SITE = None
- USER_BASE = None
- 
-+# Debian multiarch support.
-+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695707
-+# We can't use subprocess here. :/
-+host_architectures = []
-+for command in ['dpkg-architecture -qDEB_HOST_MULTIARCH',
-+                'gcc -print-multiarch',
-+                ]:
-+    try:
-+        with os.popen(command) as fp:
-+            host_arch = fp.read().splitlines()[0]
-+            if host_arch not in host_architectures:
-+                host_architectures.append(host_arch)
-+    except IndexError:
-+        pass
-+host_architectures.append('plat-%s' % sys.platform)
-+
- _is_pypy = hasattr(sys, 'pypy_version_info')
- _is_jython = sys.platform[:4] == 'java'
- if _is_jython:
-@@ -570,9 +586,10 @@
-         #
-         # This is hardcoded in the Python executable, but relative to sys.prefix:
-         for path in paths[:]:
--            plat_path = os.path.join(path, 'plat-%s' % sys.platform)
--            if os.path.exists(plat_path):
--                paths.append(plat_path)
-+            for host_arch in host_architectures:
-+                plat_path = os.path.join(path, host_arch)
-+                if os.path.exists(plat_path):
-+                    paths.append(plat_path)
-     elif sys.platform == 'win32':
-         paths = [os.path.join(sys.real_prefix, 'Lib'), os.path.join(sys.real_prefix, 'DLLs')]
-     else:

Modified: packages/python-virtualenv/trunk/debian/patches/series
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/series	2012-12-19 15:05:02 UTC (rev 23191)
+++ packages/python-virtualenv/trunk/debian/patches/series	2012-12-20 16:28:20 UTC (rev 23192)
@@ -2,4 +2,3 @@
 use_distribute.patch
 system-python.patch
 entry-points.patch
-multiarch.patch