X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fupload.py;h=9c17b944e59e715def78236a96fd082791047dc0;hb=731d594cc9032c1e889c90bc55092536c96e284c;hp=1683b8b0f4b152fe38c9641441d8ed1cef6ca4ef;hpb=060b14401469edd7321257c6e16bbefeaf1fa476;p=dak.git

diff --git a/daklib/upload.py b/daklib/upload.py
index 1683b8b0..9c17b944 100644
--- a/daklib/upload.py
+++ b/daklib/upload.py
@@ -28,17 +28,21 @@ import re
 
 from daklib.gpg import SignedFile
 from daklib.regexes import *
+import daklib.packagelist
 
-class InvalidChangesException(Exception):
+class UploadException(Exception):
     pass
 
-class InvalidBinaryException(Exception):
+class InvalidChangesException(UploadException):
     pass
 
-class InvalidSourceException(Exception):
+class InvalidBinaryException(UploadException):
     pass
 
-class InvalidHashException(Exception):
+class InvalidSourceException(UploadException):
+    pass
+
+class InvalidHashException(UploadException):
     def __init__(self, filename, hash_name, expected, actual):
         self.filename = filename
         self.hash_name = hash_name
@@ -53,7 +57,7 @@ class InvalidHashException(Exception):
                 "might already be known to the archive software.") \
                 .format(self.hash_name, self.filename, self.expected, self.actual)
 
-class InvalidFilenameException(Exception):
+class InvalidFilenameException(UploadException):
     def __init__(self, filename):
         self.filename = filename
     def __str__(self):
@@ -136,25 +140,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
@@ -173,7 +174,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
 
@@ -186,7 +187,7 @@ 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()
@@ -197,7 +198,7 @@ def parse_file_list(control, has_priority_and_section):
             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()
@@ -276,12 +277,20 @@ class Changes(object):
         """
         return self._signed_file.valid
 
+    @property
+    def signature_timestamp(self):
+        return self._signed_file.signature_timestamp
+
+    @property
+    def contents_sha1(self):
+        return self._signed_file.contents_sha1
+
     @property
     def architectures(self):
         """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):
@@ -450,6 +459,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')
@@ -498,6 +511,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