Merge lp:~cjwatson/launchpad-buildd/livefs-remove-suite-compat into lp:launchpad-buildd

[Colin Watson]

Stop accepting the "suite" argument to livefs builds, now that Launchpad has been updated to use the newer series/pocket protocol.

Now that launchpad-buildd 123 has been deployed everywhere (including staging), and Launchpad has been updated to use the new series/pocket protocol for livefs builds, we can drop the old suite protocol.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-25 01:55:57 +0000
+++ debian/changelog	2014-06-27 12:21:54 +0000
@@ -14,6 +14,8 @@
   [ Colin Watson ]
   * Install ltsp-server (but not its Recommends) for i386 livefs builds, as
     Edubuntu needs it.
+  * Stop accepting the "suite" argument to livefs builds, now that Launchpad
+    has been updated to use the newer series/pocket protocol.
 
  -- Colin Watson <[e-mail]>  Tue, 24 Jun 2014 14:58:16 +0100
 

=== modified file 'lpbuildd/livefs.py'
--- lpbuildd/livefs.py	2014-06-15 23:40:27 +0000
+++ lpbuildd/livefs.py	2014-06-27 12:21:54 +0000
@@ -42,19 +42,8 @@
         self.subarch = extra_args.get("subarch")
         self.project = extra_args["project"]
         self.subproject = extra_args.get("subproject")
-        if "series" in extra_args:
-            self.series = extra_args["series"]
-            self.pocket = extra_args["pocket"]
-        else:
-            # For compatibility; remove once launchpad-buildd 123 is
-            # deployed in production and the Launchpad master has been
-            # adjusted to pass series and pocket rather than suite.
-            suite = extra_args["suite"]
-            if "-" in suite:
-                self.series, self.pocket = suite.rsplit("-", 1)
-            else:
-                self.series = suite
-                self.pocket = "release"
+        self.series = extra_args["series"]
+        self.pocket = extra_args["pocket"]
         self.datestamp = extra_args.get("datestamp")
         self.image_format = extra_args.get("image_format")
         self.locale = extra_args.get("locale")