Treat packages with missing SHA1 as not duplicated.

chromite/lib/binpkg.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Adapted from portage/getbinpkg.py -- Portage binary-package helper functions
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import operator
 import os
@@ skipping 33 matching lines @@
 
   def _PopulateDuplicateDB(self, db):
     """Populate db with SHA1 -> URL mapping for packages.
 
     Args:
       db: Dictionary to populate with SHA1 -> URL mapping for packages.
     """
 
     uri = self.header['URI']
     for pkg in self.packages:
-      cpv, sha1 = pkg['CPV'], pkg['SHA1']
-      path = pkg.get('PATH', cpv + '.tbz2')
-      db[sha1] = urlparse.urljoin(uri, path)
+      cpv, sha1 = pkg['CPV'], pkg.get('SHA1')
+      if sha1:
+        path = pkg.get('PATH', cpv + '.tbz2')
+        db[sha1] = urlparse.urljoin(uri, path)
 
   def _ReadPkgIndex(self, pkgfile):
     """Read a list of key/value pairs from the Packages file into a dictionary.
 
     Both header entries and package entries are lists of key/value pairs, so
     they can both be read by this function. Entries can be terminated by empty
     lines or by the end of the file.
 
     This function will read lines from the specified file until it encounters
     the a blank line or the end of the file.
@@ skipping 106 matching lines @@
     Returns:
       A list of the packages that still need to be uploaded.
     """
     db = {}
     for pkgindex in pkgindexes:
       pkgindex._PopulateDuplicateDB(db)
 
     uploads = []
     base_uri = self.header['URI']
     for pkg in self.packages:
-      sha1 = pkg['SHA1']
+      sha1 = pkg.get('SHA1')
       uri = db.get(sha1)
-      if uri and uri.startswith(base_uri):
+      if sha1 and uri and uri.startswith(base_uri):
         pkg['PATH'] = uri[len(base_uri):].lstrip('/')
       else:
         uploads.append(pkg)
     return uploads
 
   def SetUploadLocation(self, base_uri, path_prefix):
     """Set upload location to base_uri + path_prefix.
 
     Args:
       base_uri: Base URI for all packages in the file. We set
@@ skipping 102 matching lines @@
     package_path: Directory containing Packages file.
 
   Returns:
     A PackageIndex object.
   """
   packages_file = file(os.path.join(package_path, 'Packages'))
   pkgindex = PackageIndex()
   pkgindex.Read(packages_file)
   packages_file.close()
   return pkgindex