X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=1f630a395de72c607a53cfb9bfe153f1ab41e3b4;hb=cadbdf89b46a56ad6b72c91ade7f653a8441c705;hp=136dfed6150a38ced5275cc0f1aa0734edaf3eb5;hpb=cfd5cb30c2302d4f16ffef06f56f932ea570adac;p=dak.git

diff --git a/daklib/binary.py b/daklib/binary.py
index 136dfed6..1f630a39 100755
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -72,10 +72,9 @@ class Binary(object):
         if we were given a reject function, send the reject message,
         otherwise send it to stderr.
         """
+        print >> sys.stderr, message
         if self.wrapped_reject:
             self.wrapped_reject(message)
-        else:
-            print >> sys.stderr, message
 
     def __del__(self):
         """
@@ -99,8 +98,9 @@ class Binary(object):
             (result, output) = commands.getstatusoutput(cmd)
             if result != 0:
                 rejected = True
+                print("%s: 'ar t' invocation failed." % (self.filename))
                 self.reject("%s: 'ar t' invocation failed." % (self.filename))
-                self.reject(utils.prefix_multi_line_string(output, " [ar output:] "), "")
+                self.reject(utils.prefix_multi_line_string(output, " [ar output:] "))
             self.chunks = output.split('\n')
 
 
@@ -117,6 +117,7 @@ class Binary(object):
                 cmd = "ar x %s %s %s" % (os.path.join(cwd,self.filename), self.chunks[1], self.chunks[2])
                 (result, output) = commands.getstatusoutput(cmd)
                 if result != 0:
+                    print("%s: '%s' invocation failed." % (self.filename, cmd))
                     self.reject("%s: '%s' invocation failed." % (self.filename, cmd))
                     self.reject(utils.prefix_multi_line_string(output, " [ar output:] "))
                 else:
@@ -136,16 +137,16 @@ class Binary(object):
         """
         self.__scan_ar()
         rejected = not self.chunks
-        if len(self.chunks) != 3:
+        if len(self.chunks) < 3:
             rejected = True
             self.reject("%s: found %d chunks, expected 3." % (self.filename, len(self.chunks)))
         if self.chunks[0] != "debian-binary":
             rejected = True
             self.reject("%s: first chunk is '%s', expected 'debian-binary'." % (self.filename, self.chunks[0]))
-        if self.chunks[1] != "control.tar.gz":
+        if not rejected and self.chunks[1] != "control.tar.gz":
             rejected = True
             self.reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (self.filename, self.chunks[1]))
-        if self.chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]:
+        if not rejected and self.chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]:
             rejected = True
             self.reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (self.filename, self.chunks[2]))
 
@@ -166,33 +167,35 @@ class Binary(object):
 
         @return True if the deb is valid and contents were imported
         """
-        rejected = not self.valid_deb()
-        self.__unpack()
-
         result = False
+        rejected = not self.valid_deb()
+        if not rejected:
+            self.__unpack()
 
-        cwd = os.getcwd()
-        if not rejected and self.tmpdir:
-            try:
-                os.chdir(self.tmpdir)
-                if self.chunks[1] == "control.tar.gz":
-                    control = tarfile.open(os.path.join(self.tmpdir, "control.tar.gz" ), "r:gz")
-                    control.extract('./control', self.tmpdir )
-                if self.chunks[2] == "data.tar.gz":
-                    data = tarfile.open(os.path.join(self.tmpdir, "data.tar.gz"), "r:gz")
-                elif self.chunks[2] == "data.tar.bz2":
-                    data = tarfile.open(os.path.join(self.tmpdir, "data.tar.bz2" ), "r:bz2")
-
-                if bootstrap_id:
-                    result = DBConn().insert_content_paths(bootstrap_id, [tarinfo.name for tarinfo in data if not tarinfo.isdir()])
-                else:
-                    pkg = deb822.Packages.iter_paragraphs(file(os.path.join(self.tmpdir,'control'))).next()
-                    result = DBConn().insert_pending_content_paths(pkg, [tarinfo.name for tarinfo in data if not tarinfo.isdir()])
 
-            except:
-                traceback.print_exc()
+            cwd = os.getcwd()
+            if not rejected and self.tmpdir:
+                try:
+                    os.chdir(self.tmpdir)
+                    if self.chunks[1] == "control.tar.gz":
+                        control = tarfile.open(os.path.join(self.tmpdir, "control.tar.gz" ), "r:gz")
+                        control.extract('./control', self.tmpdir )
+                    if self.chunks[2] == "data.tar.gz":
+                        data = tarfile.open(os.path.join(self.tmpdir, "data.tar.gz"), "r:gz")
+                    elif self.chunks[2] == "data.tar.bz2":
+                        data = tarfile.open(os.path.join(self.tmpdir, "data.tar.bz2" ), "r:bz2")
+
+                    if bootstrap_id:
+                        result = DBConn().insert_content_paths(bootstrap_id, [tarinfo.name for tarinfo in data if not tarinfo.isdir()])
+                    else:
+                        pkgs = deb822.Packages.iter_paragraphs(file(os.path.join(self.tmpdir,'control')))
+                        pkg = pkgs.next()
+                        result = DBConn().insert_pending_content_paths(pkg, [tarinfo.name for tarinfo in data if not tarinfo.isdir()])
+
+                except:
+                    traceback.print_exc()
 
-        os.chdir(cwd)
+            os.chdir(cwd)
         return result
 
     def check_utf8_package(self, package):