launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/remove-daily-installers into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #827965 in Launchpad itself: "Ditch daily installers"
  https://bugs.launchpad.net/launchpad/+bug/827965

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/remove-daily-installers/+merge/107136

== Summary ==

As Jeroen and I established in the IRC discussion cited in bug 827965, the support for automatic daily uploads of debian-installer is not used and in reality is unlikely to be used in future (to my certain knowledge, I was the only client of this facility).  This code was ported from dak, and the daily-installer support has not been exercised in production since the Ubuntu archive switched to Launchpad.  Let's kill it and save a little bit of complexity.

== Tests ==

bin/test -vvct debian-installer

== Demo and Q/A ==

None required.

== Lint ==

A bunch of pre-existing doctest lint in lib/lp/soyuz/doc/distroseriesqueue-debian-installer.txt.  I'm ignoring this for now as I have plans to rip out this doctest and replace it with unit tests in the near future (which in fact is why I decided to fix this bug first).
-- 
https://code.launchpad.net/~cjwatson/launchpad/remove-daily-installers/+merge/107136
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/remove-daily-installers into lp:launchpad.

=== modified file 'lib/lp/archivepublisher/debian_installer.py'
--- lib/lp/archivepublisher/debian_installer.py	2010-08-20 20:31:18 +0000
+++ lib/lp/archivepublisher/debian_installer.py	2012-05-23 23:06:19 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """The processing of debian installer tarballs."""
@@ -21,9 +21,9 @@
 
 class DebianInstallerAlreadyExists(CustomUploadError):
     """A build for this type, architecture, and version already exists."""
-    def __init__(self, build_type, arch, version):
-        message = ('%s build %s for architecture %s already exists' %
-                   (build_type, arch, version))
+    def __init__(self, arch, version):
+        message = ('installer build %s for architecture %s already exists' %
+                   (arch, version))
         CustomUploadError.__init__(self, message)
 
 
@@ -38,14 +38,11 @@
 
       * BASE: base name (usually 'debian-installer-images');
       * VERSION: encoded version (something like '20061102ubuntu14');
-      * if the version string contains '.0.' we assume it is a
-        'daily-installer', otherwise, it is a normal 'installer';
       * ARCH: targeted architecture tag ('i386', 'amd64', etc);
 
-    The contents are extracted in the archive, respecting its type
-    ('installer' or 'daily-installer'), in the following path:
+    The contents are extracted in the archive in the following path:
 
-         <ARCHIVE>/dists/<SUITE>/main/<TYPE>-<ARCH>/<VERSION>
+         <ARCHIVE>/dists/<SUITE>/main/installer-<ARCH>/<VERSION>
 
     A 'current' symbolic link points to the most recent version.
     """
@@ -57,19 +54,12 @@
         self.version = components[1]
         self.arch = components[2].split('.')[0]
 
-        # Is this a full build or a daily build?
-        if '.0.' not in self.version:
-            build_type = 'installer'
-        else:
-            build_type = 'daily-installer'
-
         self.targetdir = os.path.join(
             archive_root, 'dists', distroseries, 'main',
-            '%s-%s' % (build_type, self.arch))
+            'installer-%s' % self.arch)
 
         if os.path.exists(os.path.join(self.targetdir, self.version)):
-            raise DebianInstallerAlreadyExists(
-                build_type, self.arch, self.version)
+            raise DebianInstallerAlreadyExists(self.arch, self.version)
 
     def extract(self):
         CustomUpload.extract(self)

=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-debian-installer.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-debian-installer.txt	2011-12-09 01:21:32 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-debian-installer.txt	2012-05-23 23:06:19 +0000
@@ -22,15 +22,12 @@
  * BASE: base name (usually 'debian-installer-images')
 
  * VERSION: encoded version (something like '20061102ubuntu14')
-   * if the version string contains '.0.' we assume it is a
-     'daily-installer', otherwise, it is a normal 'installer'
 
  * ARCH: targeted architecture tag ('i386', 'amd64', etc)
 
-The contents are extracted in the archive, respecting its type
-('installer' or 'daily-installer'), in the following path:
+The contents are extracted in the archive in the following path:
 
- * <ARCHIVE>/dists/<SUITE>/main/<TYPE>-<ARCH>/
+ * <ARCHIVE>/dists/<SUITE>/main/installer-<ARCH>/
 
 
 Let's try one test upload and verify the results of its publication.