Merge branch 'master' into show-new

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 1411f62a2e6f302e2f72b56bb6b93be8bd3c9171..2e1eb3bbd227df52224c53c1b6a1069520a4bf67 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -69,12 +69,12 @@ Mirror-Split
   FTPPath "/srv/ftp-master.debian.org/ftp";
   TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots";
   TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs";
-  BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
+  BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; };
   CombinationTrees
   {
     popular { i386; powerpc; all; source; };
     source { source; };
-    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; };
+    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; };
   };
 };
 
@@ -638,7 +638,6 @@ Architectures
   armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
-  m68k "Motorola Mc680x0";
   mips "MIPS (Big Endian)";
   mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";

diff --git a/dak/ls.py b/dak/ls.py
index 544d366ce2e34d114380423420f1d152c569857c..85ad4905214114c6a4d89a0fe40437c575d2a40d 100755 (executable)
--- a/dak/ls.py
+++ b/dak/ls.py
@@ -56,7 +56,7 @@ Display information about PACKAGE(s).
   -S, --source-and-binary    show info for the binary children of source pkgs
 
 ARCH, COMPONENT and SUITE can be comma (or space) separated lists, e.g.
-    --architecture=m68k,i386"""
+    --architecture=amd64,i386"""
     sys.exit(exit_code)
 
 ################################################################################

diff --git a/dak/rm.py b/dak/rm.py
index 62c5f98052b844b4d994314fedcdd829095b4329..d7697fa426a0bd510aeb47d1921aa90fa33bb10c 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -75,7 +75,7 @@ Remove PACKAGE(s) from suite(s).
   -S, --source-only          remove source only
 
 ARCH, BUG#, COMPONENT and SUITE can be comma (or space) separated lists, e.g.
-    --architecture=m68k,i386"""
+    --architecture=amd64,i386"""
 
     sys.exit(exit_code)
 

diff --git a/daklib/utils.py b/daklib/utils.py
index 0896d57839eb335f30f375a602519cb727deb15c..c9b54d078db3bc6b85e05e214823eb8b54f2aa74 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -70,7 +70,9 @@ def dak_getstatusoutput(cmd):
     pipe = subprocess.Popen(cmd, shell=True, universal_newlines=True,
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
-    output = "".join(pipe.stdout.readlines())
+    output = pipe.stdout.read()
+
+    pipe.wait()
 
     if output[-1:] == '\n':
         output = output[:-1]

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 70faceb63cfec40a53a0089508729d258cc1be4a..ab01536d7adf4f165c2c1fabd7d30b297ec1e9db 100755 (executable)
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -16,8 +16,8 @@ error() {
 }
 
 # Check validity of version number
-# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDD<suite>x
-if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|[a-z]+)[0-9]+)$"; then
+# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDD<suite>x and the +b[0-9] on the end
+if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|[a-z]+)[0-9]+)(\+b[0-9])?$"; then
        error "Invalid version: '$VERSION'"
 fi
 
@@ -50,10 +50,13 @@ if [ -d "$TARGET/$VERSION" ]; then
        error "Directory already exists: $TARGET/$VERSION"
 fi
 
+# We know the VERSION is sane by here, we just need to make sure we escape the + in +b1 (if any)
+VERSIONREGEXP="$(echo $VERSION | sed 's@+@\\\+@')"
+
 # We know all data to be in ./installer-<arch>/<version>; see if there's
 # anything else in the tarball except that and the 'current' symlink
 if tar tzf "$TARBALL" | \
-   grep -Eqv "^\./(installer-$ARCH/($VERSION/.*|current|)|)$"; then
+   grep -Eqv "^\./(installer-$ARCH/($VERSIONREGEXP/.*|current|)|)$"; then
        error "Tarball contains unexpected contents"
 fi