X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=daklib%2Fupload.py;h=406b1d4069101d63669e1edb903075d24d0b69f1;hb=3f88839fc3a07eb93b1428fe7f193066a358a9a4;hp=3d63c71e5345eec9d5c6535216a5effd5da4200b;hpb=11b25f20ef4be9493992b96dd7006ed7ca26bdd8;p=dak.git

diff --git a/daklib/upload.py b/daklib/upload.py
index 3d63c71e..406b1d40 100644
--- a/daklib/upload.py
+++ b/daklib/upload.py
@@ -28,6 +28,7 @@ import re
 
 from daklib.gpg import SignedFile
 from daklib.regexes import *
+import daklib.packagelist
 
 class InvalidChangesException(Exception):
     pass
@@ -45,7 +46,13 @@ class InvalidHashException(Exception):
         self.expected = expected
         self.actual = actual
     def __str__(self):
-        return "Invalid {0} hash for {1}: expected {2}, but got {3}.".format(self.hash_name, self.filename, self.expected, self.actual)
+        return ("Invalid {0} hash for {1}:\n"
+                "According to the control file the {0} hash should be {2},\n"
+                "but {1} has {3}.\n"
+                "\n"
+                "If you did not include {1} in you upload, a different version\n"
+                "might already be known to the archive software.") \
+                .format(self.hash_name, self.filename, self.expected, self.actual)
 
 class InvalidFilenameException(Exception):
     def __init__(self, filename):
@@ -130,25 +137,22 @@ class HashedFile(object):
         @raise InvalidHashException: hash mismatch
         """
         path = os.path.join(directory, self.filename)
-        fh = open(path, 'r')
 
         size = os.stat(path).st_size
         if size != self.size:
             raise InvalidHashException(self.filename, 'size', self.size, size)
 
-        md5sum = apt_pkg.md5sum(fh)
-        if md5sum != self.md5sum:
-            raise InvalidHashException(self.filename, 'md5sum', self.md5sum, md5sum)
+        with open(path) as fh:
+            hashes = apt_pkg.Hashes(fh)
+
+        if hashes.md5 != self.md5sum:
+            raise InvalidHashException(self.filename, 'md5sum', self.md5sum, hashes.md5)
 
-        fh.seek(0)
-        sha1sum = apt_pkg.sha1sum(fh)
-        if sha1sum != self.sha1sum:
-            raise InvalidHashException(self.filename, 'sha1sum', self.sha1sum, sha1sum)
+        if hashes.sha1 != self.sha1sum:
+            raise InvalidHashException(self.filename, 'sha1sum', self.sha1sum, hashes.sha1)
 
-        fh.seek(0)
-        sha256sum = apt_pkg.sha256sum(fh)
-        if sha256sum != self.sha256sum:
-            raise InvalidHashException(self.filename, 'sha256sum', self.sha256sum, sha256sum)
+        if hashes.sha256 != self.sha256sum:
+            raise InvalidHashException(self.filename, 'sha256sum', self.sha256sum, hashes.sha256)
 
 def parse_file_list(control, has_priority_and_section):
     """Parse Files and Checksums-* fields
@@ -167,7 +171,7 @@ def parse_file_list(control, has_priority_and_section):
     """
     entries = {}
 
-    for line in control["Files"].split('\n'):
+    for line in control.get("Files", "").split('\n'):
         if len(line) == 0:
             continue
 
@@ -180,23 +184,25 @@ def parse_file_list(control, has_priority_and_section):
 
         entries[filename] = entry
 
-    for line in control["Checksums-Sha1"].split('\n'):
+    for line in control.get("Checksums-Sha1", "").split('\n'):
         if len(line) == 0:
             continue
         (sha1sum, size, filename) = line.split()
         entry = entries.get(filename, None)
-        if entry.get('size', None) != long(size):
+        if entry is None:
+            raise InvalidChangesException('{0} is listed in Checksums-Sha1, but not in Files.'.format(filename))
+        if entry is not None and entry.get('size', None) != long(size):
             raise InvalidChangesException('Size for {0} in Files and Checksum-Sha1 fields differ.'.format(filename))
         entry['sha1sum'] = sha1sum
 
-    for line in control["Checksums-Sha256"].split('\n'):
+    for line in control.get("Checksums-Sha256", "").split('\n'):
         if len(line) == 0:
             continue
         (sha256sum, size, filename) = line.split()
         entry = entries.get(filename, None)
         if entry is None:
-            raise InvalidChangesException('No sha256sum for {0}.'.format(filename))
-        if entry.get('size', None) != long(size):
+            raise InvalidChangesException('{0} is listed in Checksums-Sha256, but not in Files.'.format(filename))
+        if entry is not None and entry.get('size', None) != long(size):
             raise InvalidChangesException('Size for {0} in Files and Checksum-Sha256 fields differ.'.format(filename))
         entry['sha256sum'] = sha256sum
 
@@ -273,7 +279,7 @@ class Changes(object):
         """list of architectures included in the upload
         @type: list of str
         """
-        return self.changes['Architecture'].split()
+        return self.changes.get('Architecture', '').split()
 
     @property
     def distributions(self):
@@ -296,6 +302,13 @@ class Changes(object):
                 self._source = Source(self.directory, source_files, self._keyrings, self._require_signature)
         return self._source
 
+    @property
+    def sourceful(self):
+        """C{True} if the upload includes source
+        @type: bool
+        """
+        return "source" in self.architectures
+
     @property
     def source_name(self):
         """source package name
@@ -435,6 +448,10 @@ class Binary(object):
             version = self.control['Version']
         return (match.group('package'), version)
 
+    @property
+    def name(self):
+        return self.control['Package']
+
     @property
     def type(self):
         """package type ('deb' or 'udeb')
@@ -483,6 +500,11 @@ class Source(object):
         @type: dict-like
         """
 
+        self.package_list = daklib.packagelist.PackageList(self.dsc)
+        """Information about packages built by the source.
+        @type: daklib.packagelist.PackageList
+        """
+
         self._files = None
 
     @classmethod