Merge lp:~ubuntu-branches/ubuntu/quantal/autopkgtest/quantal-201207091011 into lp:ubuntu/quantal/autopkgtest

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/autopkgtest reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/autopkgtest/quantal-201207091011. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

39. By Martin Pitt on 2012-07-04

runner/adt-run: Split out a new read_stanzas() function from
read_control() to read a debian/control-like file, and reimplement
packages_from_source() to use that. This makes the function more robust
about different field orders and more in line with the existing code.

38. By Martin Pitt on 2012-07-04

runner/adt-run: Some stylistic updates mentioned by Ian.

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-08 23:15:42 +0000
+++ debian/changelog	2012-07-09 10:19:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 autopkgtest (2.2.3) unstable; urgency=medium
 
   [ Martin Pitt ]
@@ -23,6 +24,48 @@
   * debian/control: add Vcs-* headers pointing to Alioth Git repository
 
  -- Ian Jackson <[e-mail]>  Wed, 27 Jun 2012 21:36:56 +0100
+=======
+autopkgtest (2.2.0ubuntu5) UNRELEASED; urgency=low
+
+  * runner/adt-run: Some stylistic updates mentioned by Ian.
+  * runner/adt-run: Split out a new read_stanzas() function from
+    read_control() to read a debian/control-like file, and reimplement
+    packages_from_source() to use that. This makes the function more robust
+    about different field orders and more in line with the existing code.
+
+ -- Martin Pitt <[e-mail]>  Wed, 04 Jul 2012 17:54:42 +0200
+
+autopkgtest (2.2.0ubuntu4) quantal; urgency=low
+
+  * runner/adt-run: Filter out udebs from the '@' expansion.
+
+ -- Martin Pitt <[e-mail]>  Thu, 21 Jun 2012 18:06:35 +0200
+
+autopkgtest (2.2.0ubuntu3) quantal; urgency=low
+
+  * runner/adt-run: Fix for running in an already unpacked tree.
+
+ -- Martin Pitt <[e-mail]>  Thu, 21 Jun 2012 11:10:01 +0200
+
+autopkgtest (2.2.0ubuntu2) quantal; urgency=low
+
+  * runner/adt-run: Expand '@' test Depends: from the test package's
+    debian/control instead from the list of built .debs. The latter does not
+    work if we do not actually build the source. This uses dh_listpackage to
+    avoid duplicating all the "Architecture:" parsing magic, so add a
+    debhelper dependency.  (LP: #1015400, Closes: #678359)
+
+ -- Martin Pitt <[e-mail]>  Thu, 21 Jun 2012 10:51:00 +0200
+
+autopkgtest (2.2.0ubuntu1) quantal; urgency=low
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - Fix hashbang lines to use python instead of python2.6, and update
+      debian/control to only depend on python (>= 2.6) instead of
+      python2.6. (Debian #644332)
+
+ -- Martin Pitt <[e-mail]>  Tue, 19 Jun 2012 18:35:05 +0200
+>>>>>>> MERGE-SOURCE
 
 autopkgtest (2.2.0) unstable; urgency=low
 
 
=== modified file 'runner/adt-run'
--- runner/adt-run	2012-07-08 23:15:42 +0000
+++ runner/adt-run	2012-07-09 10:19:20 +0000
@@ -1355,13 +1355,18 @@
 
 def packages_from_source(act, tree):
     (rc, output) = subprocess_cooked(['dh_listpackages'],
+<<<<<<< TREE
             stdout=subprocess.PIPE, cwd=tree.read())
+=======
+            stdout=subprocess.PIPE, cwd=tree.read(True))
+>>>>>>> MERGE-SOURCE
     if rc: badpkg('failed to parse packages built from source, code %d' % rc)
 
     # filter out empty lines
     packages = [p for p in output.split() if p] 
 
     # filter out udebs
+<<<<<<< TREE
     control_af = RelativeInputFile(act.what+'-control',
             tree, 'debian/control')
     for st in read_stanzas(control_af):
@@ -1373,6 +1378,19 @@
                             packages.remove(st['Package'][0][1])
                     except ValueError:
                             pass
+=======
+    control_af = RelativeInputFile(act.what+'-control',
+            tree, 'debian/control')
+    for st in read_stanzas(control_af):
+            if 'Package' not in st:
+                    # source stanza
+                    continue
+            if 'Xc-package-type' in st:
+                    try:
+                        packages.remove(st['Package'][0][1])
+                    except ValueError:
+                        pass
+>>>>>>> MERGE-SOURCE
 
     return packages