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

Bug#680111: marked as done (unblock: wajig/2.7.1)

Your message dated Wed, 04 Jul 2012 19:28:39 +0100
with message-id <1341426519.10885.2.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#680111: unblock: wajig/2.7.1
has caused the Debian Bug report #680111,
regarding unblock: wajig/2.7.1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
680111: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680111
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package wajig. The change improves multi-arch
handling slightly and fixes a related exception.

diff -Nru wajig-2.7/debian/changelog wajig-2.7.1/debian/changelog
--- wajig-2.7/debian/changelog	2012-07-03 19:02:17.000000000 +0200
+++ wajig-2.7.1/debian/changelog	2012-07-02 21:04:53.000000000 +0200
@@ -1,3 +1,16 @@
+wajig (2.7.1) unstable; urgency=low
+
+  * NEW, NEWDESCRIBE: fix an exception that occurs if package exists only
+    for configured foreign architectures; Closes: #679969
+  * DESCRIBE: if package does not exist for native architecture, check if it
+    does for configured foreign ones before giving up; this is closely
+    related to the above-mentioned fix
+  * Specify a minimum dpkg version (1.16.2), due to the use of
+    --print-foreign-architectures option introduced as a result of the
+    above-mentioned fixes
+
+ -- Tshepang Lekhonkhobe <tshepang@gmail.com>  Mon, 02 Jul 2012 21:04:43 +0200
+
 wajig (2.7) unstable; urgency=low
 
   * NEW, DETAILNEW, and DESCRIBENEW:
diff -Nru wajig-2.7/debian/control wajig-2.7.1/debian/control
--- wajig-2.7/debian/control	2012-07-03 19:02:17.000000000 +0200
+++ wajig-2.7.1/debian/control	2012-07-02 19:24:05.000000000 +0200
@@ -15,7 +15,8 @@
          python3 (>= 3.2),
          apt,
          python3-apt,
-         aptitude
+         aptitude,
+         dpkg (>= 1.16.2)
 Suggests: debconf,
           reportbug,
           apt-move,
diff -Nru wajig-2.7/src/util.py wajig-2.7.1/src/util.py
--- wajig-2.7/src/util.py	2012-07-03 19:02:17.000000000 +0200
+++ wajig-2.7.1/src/util.py	2012-07-02 20:58:52.000000000 +0200
@@ -294,7 +294,17 @@
             try:
                 package = cache[package]
             except KeyError as e:
-                if die:
+                import subprocess
+                command = 'dpkg --print-foreign-architectures'.split()
+                output = subprocess.check_output(command)
+                for arch in output.decode().split():
+                    try:
+                        package = cache["{}:{}".format(package, arch)]
+                        # to avoid noise, only consider the 1st match
+                        break
+                    except KeyError:
+                        pass
+                if not isinstance(package, apt.package.Package) and die:
                     print(str(e).strip('"'))
                     return 1
             packageversion = package.installed
diff -Nru wajig-2.7/src/wajig.py wajig-2.7.1/src/wajig.py
--- wajig-2.7/src/wajig.py	2012-07-03 19:02:17.000000000 +0200
+++ wajig-2.7.1/src/wajig.py	2012-07-02 21:07:31.000000000 +0200
@@ -26,7 +26,7 @@
 import commands
 import perform
 
-VERSION = "2.7"
+VERSION = "2.7.1"
 
 
 def main():

--- End Message ---
--- Begin Message --- 
On Wed, 2012-07-04 at 20:02 +0200, Tshepang Lekhonkhobe wrote:
> On Tue, Jul 3, 2012 at 8:17 PM, Adam D. Barratt
> <adam@adam-barratt.org.uk> wrote:
> > On Tue, 2012-07-03 at 19:23 +0200, Tshepang Lekhonkhobe wrote:
> >> Please unblock package wajig. The change improves multi-arch
> >> handling slightly and fixes a related exception.
> >
> > The source package appears to have grown a bunch of cruft:
> >
> > -rw-r--r-- 0/0           55262 2012-07-02 19:06 wajig-2.7.1/debian/changelog.dch
> > drwxr-xr-x 0/0               0 2012-07-02 19:07 wajig-2.7.1/src/__pycache__/
> > -rw-r--r-- 0/0           17394 2012-07-02 19:07 wajig-2.7.1/src/__pycache__/util.cpython-32.pyc
> > -rw-r--r-- 0/0            2195 2012-07-02 19:07 wajig-2.7.1/src/__pycache__/perform.cpython-32.pyc
> >
> > Any chance you could fix that up, please?
> 
> Thanks for your careful eye. Version 2.7.2 has now been uploaded. I
> have attached the new diff.

Unblocked; thanks.

Regards,

Adam

--- End Message ---
Reply to: