X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=c6ee96f86d5f1eed8b210720697e1620e2448ead;hb=0b301ec56f3b690a1e11a4a8b6b2d9ce391de29b;hp=0a27f95ed7be821d9ec183b0d77a01fd0e13ba9d;hpb=9fa241c825a40bd09bd1c2e6b7f065f4a1dc0481;p=dak.git diff --git a/daklib/binary.py b/daklib/binary.py old mode 100755 new mode 100644 index 0a27f95e..c6ee96f8 --- a/daklib/binary.py +++ b/daklib/binary.py @@ -248,12 +248,16 @@ class Binary(object): except: print >> sys.stderr, "E: %s has non-unicode filename: %s" % (package,tarinfo.name) + result = True + except: traceback.print_exc() result = False os.chdir(cwd) + return result + __all__.append('Binary') def copy_temporary_contents(package, version, archname, deb, reject, session=None): @@ -300,7 +304,8 @@ def copy_temporary_contents(package, version, archname, deb, reject, session=Non message = utils.TemplateSubst(subst, cnf["Dir::Templates"]+"/missing-contents") utils.send_mail(message) - exists = Binary(deb, reject).scan_package() + # Temporarily disable contents storage until we re-do the table layout + #exists = Binary(deb, reject).scan_package() if exists: sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)