X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=1dd3a75e2d83c9ce70d527a955fb8d7740640cec;hb=940337a5121e1220a03f4ceedcd130ffc4bba755;hp=08b8b5c694136788f4efd0b6ae44561a151d09e3;hpb=9593b37685e816dbfc473b8b3e2dcf5fb5692b54;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 08b8b5c6..1dd3a75e 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -216,15 +216,7 @@ class Upload: dump_filename = os.path.join(dest_dir,self.pkg.changes_file[:-8] + ".dak") dump_file = utils.open_file(dump_filename, 'w') - try: - os.chmod(dump_filename, 0660) - except OSError, e: - if errno.errorcode[e.errno] == 'EPERM': - perms = stat.S_IMODE(os.stat(dump_filename)[stat.ST_MODE]) - if perms & stat.S_IROTH: - utils.fubar("%s is world readable and chmod failed." % (dump_filename)) - else: - raise + os.chmod(dump_filename, 0664) p = cPickle.Pickler(dump_file, 1) d_changes = {} @@ -236,9 +228,10 @@ class Upload: for file_entry in files.keys(): d_files[file_entry] = {} for i in [ "package", "version", "architecture", "type", "size", - "md5sum", "component", "location id", "source package", - "source version", "maintainer", "dbtype", "files id", - "new", "section", "priority", "othercomponents", + "md5sum", "sha1sum", "sha256sum", "component", + "location id", "source package", "source version", + "maintainer", "dbtype", "files id", "new", + "section", "priority", "othercomponents", "pool name", "original component" ]: if files[file_entry].has_key(i): d_files[file_entry][i] = files[file_entry][i]