Merge branch 'fix/debinfo'

[dak.git] / daklib / archive.py

diff --git a/daklib/archive.py b/daklib/archive.py
index 6562c67c3570a63daefa5f1672dd990665ebd876..677d783cdd04530e9752b2656d422f4de5e6adda 100644 (file)
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -624,7 +624,7 @@ class ArchiveUpload(object):
         session = self.transaction.session
 
         self.directory = utils.temp_dirname(parent=cnf.get('Dir::TempPath'),
-                                            mode=0o2750, group=cnf.unprivgroup)[1]
+                                            mode=0o2750, group=cnf.unprivgroup)
         with FilesystemTransaction() as fs:
             src = os.path.join(self.original_directory, self.original_changes.filename)
             dst = os.path.join(self.directory, self.original_changes.filename)
@@ -861,6 +861,7 @@ class ArchiveUpload(object):
                     checks.SignatureCheck,
                     checks.ChangesCheck,
                     checks.HashesCheck,
+                    checks.ExternalHashesCheck,
                     checks.SourceCheck,
                     checks.BinaryCheck,
                     checks.BinaryTimestampCheck,
@@ -1104,7 +1105,7 @@ class ArchiveUpload(object):
         for binary in self.changes.binaries:
             control = binary.control
             source_package, source_version = binary.source
-            line = " ".join([control['Package'], control['Version'], source_package, source_version])
+            line = " ".join([control['Package'], control['Version'], control['Architecture'], source_package, source_version])
             print >>debinfo, line
         debinfo.close()