X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fbinary.py;h=80805276c4ebcef33d7a45564b944606905cdaa4;hb=d4d5d6770b1cdb7472d02ba4241e5347f6aa6787;hp=18079b540699dd56120956e050f7c69f12c711ff;hpb=aa661dc56e7ed99df0c89d77f9b1a50c03a1a066;p=dak.git diff --git a/daklib/binary.py b/daklib/binary.py index 18079b54..80805276 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,6 +98,7 @@ 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.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: @@ -166,11 +167,11 @@ class Binary(object): @return True if the deb is valid and contents were imported """ + result = False rejected = not self.valid_deb() if not rejected: self.__unpack() - result = False cwd = os.getcwd() if not rejected and self.tmpdir: