Merge lp:~vorlon/xdeb/lp.752287 into lp:xdeb

[Steve Langasek]

[Loïc Minier (lool)]

 review approve

On Fri, Apr 08, 2011, Steve Langasek wrote:
> bin_cache = get_output(['apt-cache', apt_opts,
> - 'show', binary]).splitlines()
> + 'show',
> + '%s:%s' % (binary, options.architecture)]).splitlines()

 Looks like last line is a bit too long; please fix before merging

 Out of curiosity, does this work with pre-multiarch APTs like lucid's?

--
Loïc Minier

review: Approve

[lp:~vorlon/xdeb/lp.752287]

254. By Steve Langasek on 2011-04-11

break up the line to fit us in 80 columns

[Steve Langasek (vorlon)]

On Fri, Apr 08, 2011 at 10:28:30AM -0000, Loïc Minier wrote:
> Review: Approve
> review approve

> On Fri, Apr 08, 2011, Steve Langasek wrote:
> > bin_cache = get_output(['apt-cache', apt_opts,
> > - 'show', binary]).splitlines()
> > + 'show',
> > + '%s:%s' % (binary, options.architecture)]).splitlines()

> Looks like last line is a bit too long; please fix before merging

Fixed and pushing, thanks.

> Out of curiosity, does this work with pre-multiarch APTs like lucid's?

Nope, it doesn't. Thanks, added a breaks on old apt for this.

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world

[lp:~vorlon/xdeb/lp.752287]

255. By Steve Langasek on 2011-04-11

add a Breaks: on pre-multiarch versions of apt, since apt-cache will fail for
us otherwise

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-07 18:12:27 +0000
+++ debian/changelog	2011-04-11 22:32:20 +0000
@@ -3,6 +3,10 @@
   * If a package is Multi-Arch: foreign, we don't need to build it unless we
     also want to install it in its own right.
   * add tcl8.5 to the whitelist alongside tcl8.4.
+  * When calling apt-cache show, qualify the package name with an
+    explicit architecture; this guards against attempts to import
+    not-for-us binaries that are in the apt cache in a multiarch
+    environment.  LP: #752287.
 
   [ Wookey ]
   * Add some packages to black/whitelists 
 
=== modified file 'debian/control'
--- debian/control	2011-04-07 18:12:27 +0000
+++ debian/control	2011-04-11 22:32:20 +0000
@@ -12,6 +12,7 @@
 Depends: ${misc:Depends}, ${python:Depends}, python-debian (>= 0.1.11), dpkg-dev (>= 1.15), lintian (>= 2.3.0), devscripts (>= 2.10.41), dpkg-cross (>= 2.6.3), apt-utils, python-apt (>= 0.7.91), wget, build-essential, sudo
 Recommends: gcc, fakeroot
 XB-Python-Version: ${python:Versions}
+Breaks: apt (<< 0.7.26~exp6)
 Description: Cross-build tool for Debian packages
  xdeb allows building a set of packages, using either native or cross
  compilation.  It is based on dpkg-cross and includes heuristics to map
 
=== modified file 'xdeb.py'
--- xdeb.py	2011-04-07 11:58:36 +0000
+++ xdeb.py	2011-04-11 22:32:20 +0000
@@ -509,8 +509,9 @@
             print "Considering binary %s" % binary
         try:
             apt_opts = '-oAPT::Architecture=%s' % options.architecture
+            pkg_spec = '%s:%s' % (binary, options.architecture)
             bin_cache = get_output(['apt-cache', apt_opts,
-                                    'show', binary]).splitlines()
+                                    'show', pkg_spec]).splitlines()
         except Exception:
             if options.debug:
                 print "skipping - %s" % binary