X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=813782e23ef38e0dfc7c35818eba74d3f00a37c2;hb=e00d86bf93fe8e20b456caae7c099b153b77678f;hp=1dd3a75e2d83c9ce70d527a955fb8d7740640cec;hpb=47384ef2b7b6c6239b41623ad8612ac7fd32d089;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 1dd3a75e..813782e2 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -216,7 +216,24 @@ class Upload:
 
         dump_filename = os.path.join(dest_dir,self.pkg.changes_file[:-8] + ".dak")
         dump_file = utils.open_file(dump_filename, 'w')
-        os.chmod(dump_filename, 0664)
+        try:
+            os.chmod(dump_filename, 0664)
+        except OSError, e:
+            # chmod may fail when the dumpfile is not owned by the user
+            # invoking dak (like e.g. when NEW is processed by a member
+            # of ftpteam)
+            if errno.errorcode[e.errno] == 'EPERM':
+                perms = stat.S_IMODE(os.stat(dump_filename)[stat.ST_MODE])
+                # security precaution, should never happen unless a weird
+                # umask is set anywhere
+                if perms & stat.S_IWOTH:
+                    utils.fubar("%s is world writable and chmod failed." % \
+                        (dump_filename,))
+                # ignore the failed chmod otherwise as the file should
+                # already have the right privileges and is just, at worst,
+                # unreadable for world
+            else:
+                raise
 
         p = cPickle.Pickler(dump_file, 1)
         d_changes = {}