Treat packages with missing SHA1 as not duplicated.

prebuilt_unittest.py

Index: prebuilt_unittest.py
diff --git a/prebuilt_unittest.py b/prebuilt_unittest.py
index 9d26692ccf1e21fce3dee348902188d3896a4041..4c7255e3c5c3ab21d4794c1f5b93e61340a5211e 100755
--- a/prebuilt_unittest.py
+++ b/prebuilt_unittest.py
@@ -221,6 +221,15 @@ class TestPopulateDuplicateDB(unittest.TestCase):
     self.assertEqual(db['2'], 'http://www.example.com/foo.tgz')
     self.assertEqual(db['3'], 'http://www.example.com/private.tbz2')
 
+  def testMissingSHA1(self):
+    db = {}
+    pkgindex = SimplePackageIndex()
+    del pkgindex.packages[0]['SHA1']
+    pkgindex._PopulateDuplicateDB(db)
+    self.assertEqual(len(db), 2)
+    self.assertEqual(db['2'], 'http://www.example.com/foo.tgz')
+    self.assertEqual(db['3'], 'http://www.example.com/private.tbz2')
+
   def testFailedPopulate(self):
     db = {}
     pkgindex = SimplePackageIndex(header=False)
@@ -228,9 +237,6 @@ class TestPopulateDuplicateDB(unittest.TestCase):
     pkgindex = SimplePackageIndex()
     del pkgindex.packages[0]['CPV']
     self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
-    pkgindex = SimplePackageIndex()
-    del pkgindex.packages[0]['SHA1']
-    self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
 
 
 class TestResolveDuplicateUploads(unittest.TestCase):
@@ -261,6 +267,18 @@ class TestResolveDuplicateUploads(unittest.TestCase):
     uploads = pkgindex.ResolveDuplicateUploads([dup_pkgindex])
     self.assertEqual(pkgindex.packages, expected_pkgindex.packages)
 
+  def testMissingSHA1(self):
+    db = {}
+    pkgindex = SimplePackageIndex()
+    dup_pkgindex = SimplePackageIndex()
+    expected_pkgindex = SimplePackageIndex()
+    del pkgindex.packages[0]['SHA1']
+    del expected_pkgindex.packages[0]['SHA1']
+    for pkg in expected_pkgindex.packages[1:]:
+      pkg.setdefault('PATH', pkg['CPV'] + '.tbz2')
+    uploads = pkgindex.ResolveDuplicateUploads([dup_pkgindex])
+    self.assertEqual(pkgindex.packages, expected_pkgindex.packages)
+
 
 class TestWritePackageIndex(unittest.TestCase):