]> git.decadent.org.uk Git - dak.git/commitdiff
ignore EPERM as a result of the chmod of a .dak file
authorPhilipp Kern <pkern@debian.org>
Tue, 21 Oct 2008 08:44:17 +0000 (10:44 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 24 Oct 2008 14:48:41 +0000 (16:48 +0200)
2008-10-21  Philipp Kern  <pkern@debian.org>

        * daklib/queue.py: reintroduce James' check for EPERM after
          the chmod'ing of dak files and ignore it; just fubar if the file is
          world writable, which should really never happen

Signed-off-by: Joerg Jaspert <joerg@debian.org>
daklib/queue.py

index 1dd3a75e2d83c9ce70d527a955fb8d7740640cec..813782e23ef38e0dfc7c35818eba74d3f00a37c2 100755 (executable)
@@ -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 = {}