From: Philipp Kern <pkern@debian.org>
Date: Sat, 13 Sep 2008 14:21:13 +0000 (+0200)
Subject: make .dak files world-readable
X-Git-Tag: debian-r/squeeze~1476^2~31^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a6dbdaaf2281e70a1ccf28af8b673ab9db2a7574;p=dak.git

make .dak files world-readable

2008-09-13  Philipp Kern  <pkern@debian.org>

        * dak/queue.py (dump_vars): make .dak u,g=rw,o=r; James'
        assumption (as stated in 2002-05-18's ChangeLog entry)
        was that people will use the information therein albeit
        it is "just" a duplication of information present in
        other control files; people should still not use it
        as source of information but access to those files makes
        dak debugging easier and there is no leak of sensitive
        information involved

Signed-off-by: Philipp Kern <pkern@debian.org>
---

diff --git a/ChangeLog b/ChangeLog
index 09b9689f..f0837bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-13  Philipp Kern  <pkern@debian.org>
+
+	* dak/queue.py (dump_vars): make .dak u,g=rw,o=r; James'
+	assumption (as stated in 2002-05-18's ChangeLog entry)
+	was that people will use the information therein albeit
+	it is "just" a duplication of information present in
+	other control files; people should still not use it
+	as source of information but access to those files makes
+	dak debugging easier and there is no leak of sensitive
+	information involved
+
 2008-09-12  Philipp Kern  <pkern@debian.org>
 
 	* dak/new_security_install.py (actually_upload): remove
diff --git a/daklib/queue.py b/daklib/queue.py
index 40960b90..2c3602a2 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -217,14 +217,9 @@ 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)
+            os.chmod(dump_filename, 0664)
         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
+            raise
 
         p = cPickle.Pickler(dump_file, 1)
         d_changes = {}