Merge lp:~wookey/xdeb/xdeb-apt-download into lp:xdeb

[Wookey]

This replaces the wget mechanism for downloading build-arch binaries with apt-download.

This fixes the 'tries to download package from wrong repo' issue
https://bugs.launchpad.net/ubuntu/+source/xdeb/+bug/851427

This fix also solves a number of other problems:
1) Removes the only difference between Debian and Ubuntu versions (the native_import_source per-arch config option)
2) Allows all uses of apt config/preferences when downloading binaries (pinning, multiple repos, default-release etc), which makes the tool much more flexible
3) Probably fixes mismatched binary/source download issue: https://bugs.launchpad.net/ubuntu/+source/xdeb/+bug/753968 (needs testing)

[Colin Watson (cjwatson)]

As discussed on IRC, we do need to keep the wget option for a while because apt-get download requires you to have multiarch configured (which breaks non-native-import-based builds because xdeb has only been half-converted for multiarch), which regrettably means keeping the native_import_source option for now. However, we can make this conditional on whether you have multiarch configured or not, so that you can still get the benefits. I've made appropriate tweaks and merged this into my new-resolver branch (staged for trunk once apt 0.8.16~exp5ubuntu11 has been built and published).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-16 14:09:51 +0000
+++ debian/changelog	2011-09-16 18:47:26 +0000
@@ -22,9 +22,13 @@
   * Depend on multiarch-capable dpkg-cross and invoke it with
     --convert-multiarch
   * Fix lintian test whinge
+<<<<<<< TREE
   * Don't fail if null dpkg-cross packages are found LP: #731079
   * Include lib64c in toolchain packages list - avoids
      multipleprovides exception on 64-bit arches.  LP: #75574
+=======
+  * Use apt-get download instead of wget for native downloads LP:#851427
+>>>>>>> MERGE-SOURCE
 
   [ Steve McIntyre ]
   * Add initial support for armhf.  LP: #772526
 
=== modified file 'debian/control'
--- debian/control	2011-06-22 23:53:25 +0000
+++ debian/control	2011-09-16 18:47:26 +0000
@@ -10,7 +10,7 @@
 
 Package: xdeb
 Architecture: all
-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
+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 (>= 0.8.11), python-apt (>= 0.7.91), wget, build-essential, sudo
 Recommends: gcc, fakeroot
 Breaks: apt (<< 0.7.26~exp6)
 Description: Cross-build tool for Debian packages
 
=== modified file 'xdeb.cfg'
--- xdeb.cfg	2011-09-16 00:11:21 +0000
+++ xdeb.cfg	2011-09-16 18:47:26 +0000
@@ -114,38 +114,38 @@
 # unclear; openssh is only temporary
  openssh-client
 
+
+# Config section for each arch
+# native_import: 
+# list packages which should not have builds attempted - instead they are downloaded 
+# from a target architecture repository. The lists are initially empty.
+# Use them to skip troublesome packages in sequenced builds, by
+# downloading pre-built versions
+
 [armel]
 parent: baseline
-native_import_source: http://ports.ubuntu.com/ubuntu-ports
-# Packages which should not have builds attempted - instead they are downloaded 
-# from a target architecture repository. This list is initially empty.
-# Use it to skip troublesome packages
-native_import:
+native_import: 
 
 [target-armel-generic]
 parent: armel
 
 [armhf]
 parent: baseline
-native_import_source: http://ports.ubuntu.com/ubuntu-ports
-# Packages which should not have builds attempted - instead they are downloaded 
-# from a target architecture repository. This list is initially empty.
-# Use it to skip troublesome packages
-native_import:
+native_import: 
 
 [target-armhf-generic]
 parent: armhf
 
 [i386]
 parent: baseline
-native_import_source: http://archive.ubuntu.com/ubuntu/
+native_import: 
 
 [target-i386-generic]
 parent: i386
 
 [amd64]
 parent: baseline
-native_import_source: http://archive.ubuntu.com/ubuntu/
+native_import: 
 
 [target-amd64-generic]
 parent: amd64
 
=== modified file 'xdeb.py'
--- xdeb.py	2011-09-16 14:09:51 +0000
+++ xdeb.py	2011-09-16 18:47:26 +0000
@@ -532,21 +532,9 @@
                     continue
                 if 'filename' not in bin_stanza:
                     continue
+                utils.spawn(['apt-get', apt_opts, 'download', pkg_spec],
+                      cwd=options.builddirs[0])
                 deb = bin_stanza['filename']
-                deb_bits = re_deb_filename.match(deb)
-                if deb_bits is None:
-                    continue
-
-                if deb_bits.group(3) == build_arch:
-                    deb = re_deb_filename.sub(
-                        r'\1_\2_%s.deb' % options.architecture, deb)
-                assert target_config.native_import_source, \
-                       "No native_import_source configured for arch %s" \
-                       % options.architecture
-                utils.spawn(['wget', '-N',
-                             '%s/%s' % (target_config.native_import_source,
-                                        deb)],
-                      cwd=options.builddirs[0])
                 deb_base = deb.split('/')[-1]
                 debs.append(deb_base)
             except StopIteration: