Merge branch 'master' into dbtests

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 65ede7aaea91595071438c7e4a7f00dfcb96cd4a..0d180a184b366c52bff8ebf6cbea755a0718b36a 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -77,7 +77,7 @@ function do_buildd () {
 function do_dists () {
     cd $configdir
     dak generate-filelist
-    dak generate-packages-sources >/dev/null
+    dak generate-packages-sources -s unstable experimental >/dev/null
 }
 
 ########################################################################
@@ -88,10 +88,6 @@ function do_dists () {
 export LANG=C
 export LC_ALL=C
 
-#lockfile -r3 "$LOCK_NEW"
-# acceptnew
-#rm -f "$LOCK_NEW"
-
 # only run one cron.unchecked
 if ! lockfile -r8 $LOCKFILE; then
     echo "aborting cron.unchecked because $LOCKFILE has already been locked"

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 183baddd92cd5e2834add8f700efe34ac4efff49..48e957907278e3f908cf856b146e931403b2c4da 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -69,6 +69,9 @@ if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     find . -maxdepth 1 -mindepth 1 -type f -mmin +2880 -name 'ChangeLog.*' -delete
 fi
 
+echo "Regenerating Packages/Sources files, be patient"
+dak generate-packages-sources -s ${IMPORTSUITE} >/dev/null
+
 echo "Done"
 
 exit 0

diff --git a/scripts/debian/update-ftpstats b/scripts/debian/update-ftpstats
index ea07a72a3517aba84c156f449e1769675d1ae763..c2e1355e0e93b533ad7ca7772ce18c12ac2bf6d0 100755 (executable)
--- a/scripts/debian/update-ftpstats
+++ b/scripts/debian/update-ftpstats
@@ -3,25 +3,25 @@
 my %data;
 my %data2;
 my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "armel", "hppa",
-       "hurd-i386", "ia64", "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390",
-       "sparc");
+             "hurd-i386", "ia64", "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390",
+             "sparc");
 
 while (<>) {
-       if (/^(\d{8})\d{6}\|(?:k(?:atie|elly)|process-accepted)\|installed\|[^|]+\|[^|]+\|(\d+)\|([-\w]+)$/) {
-               if (not defined $data{$1}) {
-                       foreach $a (@archs) {
-                               $data{$1}{$a} = 0;
-                       }
-               }
-               $data{$1}{$3} += $2;
-               $data2{$1}{$3}++;
-       }
+  if (/^(\d{8})\d{6}\|(?:k(?:atie|elly)|process-(?:accepted|upload))(?:\|dak)?\|installed\|[^|]+\|[^|]+\|(\d+)\|([-\w]+)$/) {
+    if (not defined $data{$1}) {
+      foreach $a (@archs) {
+        $data{$1}{$a} = 0;
+      }
+    }
+    $data{$1}{$3} += $2;
+    $data2{$1}{$3}++;
+  }
 }
 
 foreach $p (sort keys %data) {
-       print "$p";
-       foreach $a (@archs) {
-               print ", $data{$p}{$a}";
-       }
-       print "\n";
+  print "$p";
+  foreach $a (@archs) {
+    print ", $data{$p}{$a}";
+  }
+  print "\n";
 }