Merge lp:~wgrant/launchpad/careless-executioner into lp:launchpad

[William Grant]

Make the LFC check in deathrow optional, and restrict condemned collection to Dapper so we can get rid of it.

=== modified file 'lib/lp/archivepublisher/deathrow.py'
--- lib/lp/archivepublisher/deathrow.py	2011-08-30 04:56:29 +0000
+++ lib/lp/archivepublisher/deathrow.py	2011-09-13 11:24:28 +0000
@@ -175,13 +175,15 @@
         else:
             raise AssertionError("%r is not supported." % publication_class)
 
-        clauses.append("""
-           LibraryFileAlias.content = LibraryFileContent.id AND
-           LibraryFileAlias.filename = %s AND
-           LibraryFileContent.md5 = %s
-        """ % sqlvalues(filename, file_md5))
-        clauseTables.extend(
-            ['LibraryFileAlias', 'LibraryFileContent'])
+        clauses.append("LibraryFileAlias.filename = %s" % sqlvalues(filename))
+        clauseTables.append('LibraryFileAlias')
+
+        if file_md5 is not None:
+            clauses.append("""
+                LibraryFileAlias.content = LibraryFileContent.id AND
+                LibraryFileContent.md5 = %s
+            """ % sqlvalues(file_md5))
+            clauseTables.append('LibraryFileContent')
 
         all_publications = publication_class.select(
             " AND ".join(clauses), clauseTables=clauseTables)
@@ -230,7 +232,10 @@
             """
             for pub_file in pub_record.files:
                 filename = pub_file.libraryfilealiasfilename
-                file_md5 = pub_file.libraryfilealias.content.md5
+                if pub_file.libraryfilealias.content:
+                    file_md5 = pub_file.libraryfilealias.content.md5
+                else:
+                    file_md5 = None
 
                 self.logger.debug("Checking %s (%s)" % (filename, file_md5))
 

=== modified file 'lib/lp/archivepublisher/tests/deathrow.txt'
--- lib/lp/archivepublisher/tests/deathrow.txt	2011-04-05 08:28:30 +0000
+++ lib/lp/archivepublisher/tests/deathrow.txt	2011-09-13 11:24:28 +0000
@@ -235,6 +235,12 @@
     superseded-bin_666_i386.deb: OK
     superseded_666.dsc:          OK
 
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> from lp.testing.dbuser import dbuser
+    >>> lfa = published_binary.binarypackagerelease.files[0].libraryfile
+    >>> with dbuser('librariangc'):
+    ...     removeSecurityProxy(lfa).content = None
+
 Run DeathRow against the current 'removable' context.
 
     >>> disk_pool = DiskPool(pool_path, temp_path, FakeLogger())
@@ -338,9 +344,9 @@
     >>> death_row.reap()
     DEBUG 0 Sources
     DEBUG 2 Binaries
-    DEBUG Checking stuck-bin_666_i386.deb (21c2e59531c8710156d34a3c30ac81d5)
+    DEBUG Checking stuck-bin_666_i386.deb (None)
     DEBUG Cannot remove.
-    DEBUG Checking stuck-bin_666_i386.deb (21c2e59531c8710156d34a3c30ac81d5)
+    DEBUG Checking stuck-bin_666_i386.deb (None)
     DEBUG Already verified.
     INFO Removing 0 files marked for reaping
     INFO Total bytes freed: 0
@@ -362,10 +368,10 @@
     >>> death_row.reap()
     DEBUG 0 Sources
     DEBUG 3 Binaries
-    DEBUG Checking stuck-bin_666_i386.deb (21c2e59531c8710156d34a3c30ac81d5)
-    DEBUG Checking stuck-bin_666_i386.deb (21c2e59531c8710156d34a3c30ac81d5)
+    DEBUG Checking stuck-bin_666_i386.deb (None)
+    DEBUG Checking stuck-bin_666_i386.deb (None)
     DEBUG Already verified.
-    DEBUG Checking stuck-bin_666_i386.deb (21c2e59531c8710156d34a3c30ac81d5)
+    DEBUG Checking stuck-bin_666_i386.deb (None)
     DEBUG Already verified.
     INFO Removing 1 files marked for reaping
     DEBUG Removing removed-ignored/stuck-bin_666_i386.deb from main