Merge lp:~cjwatson/launchpad/remove-single-custom-upload-exception into lp:launchpad

[Colin Watson]

Remove "single custom upload" hack: it was profoundly evil and is no longer used.

There is an ancient squamous horror lurking at the heart of archiveuploader: uploads that consist of a single custom file bypass the upload policy checks and thus may entirely lack a source package. Aside from being profoundly bad and wrong, this makes it impossible to do various useful things with these uploads, such as copy them around between pockets.

The only use of this was for translated package descriptions, and Michael Vogt has now amended his scripts to produce a proper source package instead. We should therefore close this loophole before some enterprising soul finds a new use for it.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2012-01-05 11:48:27 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2012-06-26 16:53:29 +0000
@@ -165,21 +165,16 @@
         for uploaded_file in self.changes.files:
             self.run_and_collect_errors(uploaded_file.verify)
 
-        if (len(self.changes.files) == 1 and
-            isinstance(self.changes.files[0], CustomUploadFile)):
-            self.logger.debug("Single Custom Upload detected.")
-        else:
-            policy.validateUploadType(self)
-
-            if self.sourceful and not self.changes.dsc:
-                self.reject(
-                    "Unable to find the DSC file in the source upload.")
-
-            # Apply the overrides from the database. This needs to be done
-            # before doing component verifications because the component
-            # actually comes from overrides for packages that are not NEW.
-            self.find_and_apply_overrides()
-            self._overrideDDEBSs()
+        policy.validateUploadType(self)
+
+        if self.sourceful and not self.changes.dsc:
+            self.reject("Unable to find the DSC file in the source upload.")
+
+        # Apply the overrides from the database. This needs to be done
+        # before doing component verifications because the component
+        # actually comes from overrides for packages that are not NEW.
+        self.find_and_apply_overrides()
+        self._overrideDDEBSs()
 
         # Override archive location if necessary.
         self.overrideArchive()

=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2012-01-20 16:11:11 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2012-06-26 16:53:29 +0000
@@ -660,12 +660,17 @@
 
         :return: The queue items that were uploaded.
         """
-        test_files_dir = os.path.join(config.root,
-            "lib/lp/archiveuploader/tests/data/")
+        upload_dir = self.queueUpload("bar_1.0-1", "~name16/ubuntu")
+        self.processUpload(self.uploadprocessor, upload_dir)
+        [build] = self.name16.archive.getBuildRecords(name="bar")
+
+        test_files_dir = os.path.join(
+            config.root, "lib/lp/archiveuploader/tests/data/")
+        self.options.context = "buildd"
         upload_dir = self.queueUpload(
             "debian-installer", "~name16/ubuntu/breezy",
             test_files_dir=test_files_dir)
-        self.processUpload(self.uploadprocessor, upload_dir)
+        self.processUpload(self.build_uploadprocessor, upload_dir, build=build)
 
         queue_items = self.breezy.getPackageUploads(
             name=u"debian-installer",