[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#605500: unblock: python-defaults/2.6.6-3+squeeze2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package python-defaults

These are two trivial fixes backported from 2.6.6-6 (which I will upload
to experimental soon)

unblock python-defaults/2.6.6-3+squeeze2

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru python-defaults-2.6.6/debian/changelog python-defaults-2.6.6/debian/changelog
--- python-defaults-2.6.6/debian/changelog	2010-10-18 19:14:11.000000000 +0200
+++ python-defaults-2.6.6/debian/changelog	2010-11-30 19:59:18.000000000 +0100
@@ -1,3 +1,14 @@
+python-defaults (2.6.6-3+squeeze2) unstable; urgency=low
+
+  * pycompile:
+    - `pycompile $DESTDIR/usr/lib/python*` will recognize public
+      site-packages directories and use the right interpreter instead of
+      raising KeyError
+    - do not try to check if interpreter is present when version range is
+      empty (closes: 605356)
+
+ -- Piotr Ożarowski <piotr@debian.org>  Tue, 30 Nov 2010 19:57:51 +0100
+
 python-defaults (2.6.6-3+squeeze1) unstable; urgency=medium
 
   * pycompile: if installed Python is requested via -V option, use it even if
diff -Nru python-defaults-2.6.6/pycompile python-defaults-2.6.6/pycompile
--- python-defaults-2.6.6/pycompile	2010-10-18 19:08:20.000000000 +0200
+++ python-defaults-2.6.6/pycompile	2010-11-30 20:00:57.000000000 +0100
@@ -191,7 +191,13 @@
         if exists("%sc" % fn):
             continue
         for version in versions_to_compile:
-            pipe = STDINS[version]
+            try:
+                pipe = STDINS[version]
+            except KeyError:
+                # `pycompile /usr/lib/` invoked, add missing worker
+                pipe = py_compile(version, WORKERS)
+                pipe.next()
+                STDINS[version] = pipe
             pipe.send(fn)
 
 
@@ -236,6 +242,7 @@
             'public modules to skip')
 
     if options.vrange and options.vrange[0] == options.vrange[1] and\
+       options.vrange != (None, None) and\
        exists("/usr/bin/python%d.%d" % options.vrange[0]):
         # specific version requested, use it even if it's not in SUPPORTED
         versions = set(options.vrange[:1])

Attachment: signature.asc
Description: Digital signature


Reply to: