From: Philipp Kern <pkern@debian.org>
Date: Sat, 13 Sep 2008 14:40:02 +0000 (+0000)
Subject: Merge branch 'master' of /srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bdc67f9ca8905fe83d7c2c8c1dd7a41bcd1801ce;hp=f483192cca8c19dd46a73c469888ac440fbadb9d;p=dak.git

Merge branch 'master' of /srv/ftp.debian.org/git/dak

Conflicts:

	ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index cc0c8302..7d3a7ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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
+	oldstable-security/amd64 check; Etch, as the next oldstable,
+	already had proper amd64 support
+
 2008-09-12  Joerg Jaspert  <joerg@debian.org>
 
 	* scripts/debian/update-pseudopackages.sh: s/i/file/
diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 4cfd2133..a6469e27 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -235,10 +235,6 @@ def actually_upload(changes_files):
         files = Upload.pkg.files
         changes = Upload.pkg.changes
         dsc = Upload.pkg.dsc
-        # We have the changes, now return if its amd64, to not upload them to ftp-master
-        if changes["distribution"].has_key("oldstable-security") and changes["architecture"].has_key("amd64"):
-            print "Not uploading amd64 oldstable-security changes to ftp-master\n"
-            continue
         # Build the file list for this .changes file
         for file in files.keys():
             poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"],
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 = {}