launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/restrict-populate-archive-options into lp:launchpad.

Commit message:
Remove non-functional distro- and archive-related options from populate-archive.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1368096 in Launchpad itself: "populate-archive ignores --suite argument"
  https://bugs.launchpad.net/launchpad/+bug/1368096

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/restrict-populate-archive-options/+merge/242196

Remove some inapplicable stock SoyuzScript options from populate-archive.  I think it's sufficient to just make sure that test_populatearchive still passes, which it does.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/restrict-populate-archive-options into lp:launchpad.

=== modified file 'lib/lp/soyuz/scripts/populate_archive.py'
--- lib/lp/soyuz/scripts/populate_archive.py	2014-07-09 01:25:05 +0000
+++ lib/lp/soyuz/scripts/populate_archive.py	2014-11-19 12:05:22 +0000
@@ -312,7 +312,8 @@
     def add_my_options(self):
         """Parse command line arguments for copy archive creation/population.
         """
-        SoyuzScript.add_my_options(self)
+        self.add_transaction_options()
+        self.add_package_location_options()
 
         self.parser.add_option(
             "-a", "--architecture", dest="arch_tags", action="append",
@@ -378,3 +379,8 @@
             "--nonvirtualized", dest="nonvirtualized", default=False,
             action="store_true",
             help='Create the archive as nonvirtual if specified.')
+
+    def setupLocation(self):
+        # SoyuzScript's default model of a single context location doesn't
+        # make sense here.
+        pass