Merge lp:~cjwatson/launchpad/remove-data-tar-xz-version-requirement into lp:launchpad

[Colin Watson]

Now that Ubuntu 12.04 LTS has been released, we no longer need to check Pre-Depends for data.tar.xz uploads to ensure safe upgrades.

== Summary ==

In bug 619152, I added data.tar.xz upload support to Launchpad, and in https://code.launchpad.net/~cjwatson/launchpad/dpkg-xz-support-619152/+merge/32868 I noted "In order to make sure that upgrades work properly, we need to enforce a Pre-Depends on a new enough version of dpkg in packages using this, at least until the next LTS release". Now that we've had that LTS release, it is safe to drop the Pre-Depends check and the associated tests, so that we can drop various deltas against Debian.

== Tests ==

bin/test -vvct test_nascentuploadfile

[Brad Crittenden (bac)]

Hi Colin,

Thanks for remembering to make this change and doing so in such a timely manner.

In the test you restored, test_verifyFormat_xz_good_predep, is it still necessary to have the 'Pre-Depends' in the control in order for the upload to be accepted? Perhaps you can keep the test, though rename it, and remove the dependencies that are made obsolete by your branch.

Once ready I'll be happy to land it for you.

Normally I'd mark this as 'Approved' but this time I'm setting it to 'Needs fixing' as a reminder that I need to revisit it when you've made the change and then land it.

review: Needs Fixing (code)

[Colin Watson (cjwatson)]

On Fri, Apr 27, 2012 at 02:05:21PM -0000, Brad Crittenden wrote:
> In the test you restored, test_verifyFormat_xz_good_predep, is it
> still necessary to have the 'Pre-Depends' in the control in order for
> the upload to be accepted? Perhaps you can keep the test, though
> rename it, and remove the dependencies that are made obsolete by your
> branch.

It isn't necessary to have the Pre-Depends any more, no. I've pushed a
change that removes it. How's that?

> Once ready I'll be happy to land it for you.
>
> Normally I'd mark this as 'Approved' but this time I'm setting it to
> 'Needs fixing' as a reminder that I need to revisit it when you've
> made the change and then land it.

Thanks. I have PQM access these days, though, so all I need is for a
member of ~launchpad to set the MP status to Approved when you're happy
and then I can land it myself.

[Brad Crittenden (bac)]

That looks great Colin. Good news about you being able to commit.

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2012-02-21 22:46:28 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2012-04-27 14:23:20 +0000
@@ -711,47 +711,6 @@
                 "data.tar.bz2, data.tar.lzma or data.tar.xz." %
                 (self.filename, data_tar))
 
-        # xz-compressed debs must pre-depend on dpkg >= 1.15.6~.
-        XZ_REQUIRED_DPKG_VER = '1.15.6~'
-        if data_tar == "data.tar.xz":
-            parsed_deps = []
-            try:
-                parsed_deps = apt_pkg.parse_depends(
-                    self.control['Pre-Depends'])
-            except (ValueError, TypeError):
-                yield UploadError(
-                    "Can't parse Pre-Depends in the control file.")
-                return
-            except KeyError:
-                # Go past the for loop and yield the error below.
-                pass
-
-            for token in parsed_deps:
-                try:
-                    name, version, relation = token[0]
-                except ValueError:
-                    yield("APT error processing token '%r' from Pre-Depends.")
-                    return
-
-                if name == 'dpkg':
-                    # VersionCompare returns values similar to cmp;
-                    # negative if first < second, zero if first ==
-                    # second and positive if first > second.
-                    if apt_pkg.version_compare(
-                        version, XZ_REQUIRED_DPKG_VER) >= 0:
-                        # Pre-Depends dpkg is fine.
-                        return
-                    else:
-                        yield UploadError(
-                            "Pre-Depends dpkg version should be >= %s "
-                            "when using xz compression." %
-                            XZ_REQUIRED_DPKG_VER)
-                        return
-
-            yield UploadError(
-                "Require Pre-Depends: dpkg (>= %s) when using xz "
-                "compression." % XZ_REQUIRED_DPKG_VER)
-
     def verifyDebTimestamp(self):
         """Check specific DEB format timestamp checks."""
         self.logger.debug("Verifying timestamps in %s" % (self.filename))

=== modified file 'lib/lp/archiveuploader/tests/test_nascentuploadfile.py'
--- lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2012-01-01 02:58:52 +0000
+++ lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2012-04-27 14:23:20 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test NascentUploadFile functionality."""
@@ -325,42 +325,15 @@
         self.assertEquals("0.42", uploadfile.source_version)
         self.assertEquals("0.42", uploadfile.control_version)
 
-    def test_verifyFormat_xz_good_predep(self):
-        # verifyFormat accepts xz-compressed .debs with a sufficient dpkg
-        # pre-dependency.
+    def test_verifyFormat_xz(self):
+        # verifyFormat accepts xz-compressed .debs.
         uploadfile = self.createDebBinaryUploadFile(
             "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
             None, data_format="xz")
         control = self.getBaseControl()
-        control["Pre-Depends"] = "dpkg (>= 1.15.6~)"
         uploadfile.parseControl(control)
         self.assertEqual([], list(uploadfile.verifyFormat()))
 
-    def test_verifyFormat_xz_bad_predep(self):
-        # verifyFormat rejects xz-compressed .debs with an insufficient dpkg
-        # pre-dependency.
-        uploadfile = self.createDebBinaryUploadFile(
-            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
-            None, data_format="xz")
-        control = self.getBaseControl()
-        control["Pre-Depends"] = "dpkg (>= 1.15.5)"
-        uploadfile.parseControl(control)
-        errors = list(uploadfile.verifyFormat())
-        self.assertEqual(1, len(errors))
-        self.assertIsInstance(errors[0], UploadError)
-
-    def test_verifyFormat_xz_no_predep(self):
-        # verifyFormat rejects xz-compressed .debs with no dpkg
-        # pre-dependency.
-        uploadfile = self.createDebBinaryUploadFile(
-            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
-            None, data_format="xz")
-        control = self.getBaseControl()
-        uploadfile.parseControl(control)
-        errors = list(uploadfile.verifyFormat())
-        self.assertEqual(1, len(errors))
-        self.assertIsInstance(errors[0], UploadError)
-
     def test_storeInDatabase(self):
         # storeInDatabase creates a BinaryPackageRelease.
         uploadfile = self.createDebBinaryUploadFile(