Merge commit 'tomv_w/master' into merge

* commit 'tomv_w/master':
  * no / in x-day
  * fix bug in .commands rm-handling
  * add delayed aging, extend is_on_target to consider all files
  * debianqueued: finish new-style command handling
  * debianqueued: allow removal from target delayed queue
  * debianqueued/config: add delayed fields to sample config
  2008-09-11  Thomas Viehmann  <tv@beamnet.de>

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index 914921caa1ab5a4fdcbec568059f14a58215e191..7d3a7ddf26f8f08debe599f510315d9446ac6bdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+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/
+
+2008-09-11  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/pseudo-packages.description, ...maintainers:
+       Removed, now with the bts people
+
+       * scripts/debian/update-pseudopackages.sh: Added, fetching
+       pseudo-packages from new bts location
+
+       * scripts/debian/mkmaintainers: Use new location
+
 2008-09-08  Philipp Kern  <pkern@debian.org>
 
        * dak/check_archive.py (check_checksums): rewind the files

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 6df0bc69a77c56575cf646fa2f18ec0a3bb06514..de44fe5f05ac7e98e4a1e30a9c1bc6be19a68a05 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -70,6 +70,7 @@ cd $configdir
 $scriptsdir/update-bugdoctxt
 $scriptsdir/update-mirrorlists
 $scriptsdir/update-mailingliststxt
+$scriptsdir/update-pseudopackages.sh
 
 ################################################################################
 

diff --git a/config/debian/pseudo-packages.description b/config/debian/pseudo-packages.description
deleted file mode 100644 (file)
index d6993ad..0000000
--- a/config/debian/pseudo-packages.description
+++ /dev/null
@@ -1,26 +0,0 @@
-base                   Base system general bugs
-cdrom                  Installation system
-spam                   Spam (reassign spam to here so we can complain about it)
-press                  Press release issues
-kernel                 Problems with the Linux kernel, or that shipped with Debian
-project                        Problems related to project administration
-general                        General problems (e.g. "many manpages are mode 755")
-nm.debian.org          New Maintainer process and nm.debian.org webpages
-qa.debian.org          The Quality Assurance group
-ftp.debian.org         Problems with the FTP site
-www.debian.org         Problems with the WWW site
-bugs.debian.org                The bug tracking system, @bugs.debian.org
-lists.debian.org       The mailing lists, debian-*@lists.debian.org
-wnpp                   Work-Needing and Prospective Packages list
-cdimage.debian.org     CD Image issues
-tech-ctte              The Debian Technical Committee (see the Constitution)
-mirrors                        Problems with the official mirrors
-security.debian.org    The Debian Security Team
-installation-reports   Reports of installation problems with stable & testing
-upgrade-reports                Reports of upgrade problems for stable & testing
-release-notes          Problems with the Release Notes
-wiki.debian.org                Problems with the Debian wiki
-security-tracker       The Debian Security Bug Tracker
-release.debian.org     Requests regarding Debian releases and release team tools
-debian-i18n                    Requests regarding Internationalization (i18n) of the distribution
-buildd.emdebian.org            Problems related to building packages for Emdebian

diff --git a/config/debian/pseudo-packages.maintainers b/config/debian/pseudo-packages.maintainers
deleted file mode 100644 (file)
index 0d8c600..0000000
--- a/config/debian/pseudo-packages.maintainers
+++ /dev/null
@@ -1,26 +0,0 @@
-base                   Base Maintainers <virtual-pkg-base-maintainers@lists.alioth.debian.org>
-cdrom                  Debian CD-ROM Team <debian-cd@lists.debian.org>
-press                  press@debian.org
-bugs.debian.org                Debian Bug Tracking Team <owner@bugs.debian.org>
-ftp.debian.org         Debian FTP Master <ftpmaster@ftp-master.debian.org>
-nm.debian.org          New Maintainer Front-Desk <new-maintainer@debian.org>
-qa.debian.org          debian-qa@lists.debian.org
-www.debian.org         Debian WWW Team <debian-www@lists.debian.org>
-mirrors                        Debian Mirrors Team <mirrors@debian.org>
-project                        debian-project@lists.debian.org
-general                        debian-devel@lists.debian.org
-kernel                 Debian Kernel Team <debian-kernel@lists.debian.org>
-lists.debian.org       Debian Listmaster Team <listmaster@lists.debian.org>
-spam                   spam@debian.org
-wnpp                   wnpp@debian.org
-cdimage.debian.org     Debian CD-ROM Team <debian-cd@lists.debian.org>
-tech-ctte              Technical Committee <debian-ctte@lists.debian.org>  
-security.debian.org     Debian Security Team <team@security.debian.org>
-installation-reports    Debian Install Team <debian-boot@lists.debian.org>
-upgrade-reports         Debian Testing Group <debian-testing@lists.debian.org>
-release-notes           Debian Documentation Team <debian-doc@lists.debian.org>
-wiki.debian.org         Debian WWW Team <debian-www@lists.debian.org>
-security-tracker        Debian Security Tracker Team <debian-security-tracker@lists.debian.org>
-release.debian.org      Debian Release Team <debian-release@lists.debian.org>
-debian-i18n             Debian I18N Team <debian-i18n@lists.debian.org>
-buildd.emdebian.org                    Debian Embedded Team <debian-embedded@lists.debian.org>

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 4cfd2133a92676d948af481d462597c26535d036..a6469e27f4dfdd8f90fb1c245851867259ef4e1e 100755 (executable)
--- 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 40960b9040e297cd2c10953e5015389ba297caa4..1dd3a75e2d83c9ce70d527a955fb8d7740640cec 100755 (executable)
--- 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 = {}

diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers
index aa80065fb6ee31afdd0975daaf6a92f8c80f4036..a0abaa1f7cf5fac627e022f00bc8ef7475edc38b 100755 (executable)
--- a/scripts/debian/mkmaintainers
+++ b/scripts/debian/mkmaintainers
@@ -8,7 +8,7 @@ set -e
 cd $base/misc/
 
 cd $indices
-dak make-maintainers $configdir/pseudo-packages.maintainers | sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
+dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers | sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 
 set +e
 cmp .new-maintainers Maintainers >/dev/null

diff --git a/scripts/debian/update-pseudopackages.sh b/scripts/debian/update-pseudopackages.sh
new file mode 100755 (executable)
index 0000000..d9a4d23
--- /dev/null
+++ b/scripts/debian/update-pseudopackages.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Fetches latest copy of pseudo-packages
+# Joerg Jaspert <joerg@debian.org>
+
+. vars
+
+cd ${scriptdir}/masterfiles
+
+echo Updating archive version of pseudo-packages
+for file in maintainers description; do
+       wget -t2 -T20 -q -N http://bugs.debian.org/pseudopackages/pseudo-packages.${file} || echo "Some error occured with $file..."
+done