Merge lp:~allenap/launchpad/ddebs-n-udebs-go-shopping-bug-886452 into lp:launchpad

[Gavin Panella]

[r=julian-edwards][bug=886452] Match ddebs with udebs as well as debs.

[Julian Edwards (julian-edwards)]

Told you it was easy :)

Thanks for the cleanup too!

review: Approve

[Gavin Panella (allenap)]

Julian, I got a weird test failure in this branch which doesn't appear to be related to my change. Nevertheless, I've had a stab at fixing it, though I'm not sure that my solution is the best way to do so. Please could you look at the changes I made to test_twistedsftp.py?

[Julian Edwards (julian-edwards)]

You're right, it's completely unrelated, and I've no idea why it would fail. I must admit I don't like the change to the test, it's masking (pun intended) the problem.

Does it fail locally or only in ec2?

[Gavin Panella (allenap)]

On 30 November 2011 09:13, Julian Edwards <...> wrote:
> You're right, it's completely unrelated, and I've no idea why it
> would fail.  I must admit I don't like the change to the test, it's
> masking (pun intended) the problem.

If the original test is correct, then I'll sort out the behaviour to
match that, probably by creating the file 0600 then resetting the
perms to 0644. I assume it is correct, but can you confirm?

> Does it fail locally or only in ec2?

Both! Very puzzling.

Thanks, Gavin.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2011-10-25 11:44:47 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2011-11-30 16:31:53 +0000
@@ -33,6 +33,7 @@
     DdebBinaryUploadFile,
     DebBinaryUploadFile,
     SourceUploadFile,
+    UdebBinaryUploadFile,
     UploadError,
     UploadWarning,
     )
@@ -348,9 +349,11 @@
                     unmatched_ddebs[ddeb_key] = uploaded_file
 
         for uploaded_file in self.changes.files:
-            # We need exactly a DEB, not a DDEB.
-            if (isinstance(uploaded_file, DebBinaryUploadFile) and
-                not isinstance(uploaded_file, DdebBinaryUploadFile)):
+            is_deb = isinstance(uploaded_file, DebBinaryUploadFile)
+            is_udeb = isinstance(uploaded_file, UdebBinaryUploadFile)
+            is_ddeb = isinstance(uploaded_file, DdebBinaryUploadFile)
+            # We need exactly a DEB or UDEB, not a DDEB.
+            if (is_deb or is_udeb) and not is_ddeb:
                 try:
                     matching_ddeb = unmatched_ddebs.pop(
                         (uploaded_file.package + '-dbgsym',

=== modified file 'lib/lp/archiveuploader/tests/test_nascentupload.py'
--- lib/lp/archiveuploader/tests/test_nascentupload.py	2011-10-19 11:09:38 +0000
+++ lib/lp/archiveuploader/tests/test_nascentupload.py	2011-11-30 16:31:53 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test NascentUpload functionality."""
@@ -65,6 +65,8 @@
         self.addFile('blah_1.0_all.deb')
         self.addFile('libblah_1.0_i386.deb')
         self.addFile('libblah-dbgsym_1.0_i386.ddeb')
+        self.addFile('libfooble_1.0_i386.udeb')
+        self.addFile('libfooble-dbgsym_1.0_i386.ddeb')
         self.assertMatchDDEBErrors([])
         self.assertIs(None, self.changes.files[0].ddeb_file)
         self.assertIs(self.changes.files[2], self.changes.files[1].ddeb_file)