Merge remote-tracking branch 'jcristau/gps2-log-list'

* jcristau/gps2-log-list:
  gps2: fix typo in error logging
  gps2: fix logging call

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

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index f0acb683d74a4e1b36c02967aee0819dffe7f9cb..63a2653009eaec62bbf193356b19903d79964d10 100755 (executable)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -117,7 +117,7 @@ function i18n1() {
                 for dir in ${extimportdists}; do
                     if [[ -d dists/${dir}/  ]]; then
                         cd dists/${dir}/main/i18n
-                        rsync -aq --delete --delete-after --exclude Translation-en.bz2 --exclude Translation-*.diff/ . ${ftpdir}/dists/${dir}/main/i18n/.
+                        rsync -aq --delete --delete-after --exclude by-hash --exclude Translation-en.bz2 --exclude "Translation-*.diff/" . ${ftpdir}/dists/${dir}/main/i18n/.
                     fi
                     cd ${scriptdir}/i18nsync
                 done
@@ -152,7 +152,7 @@ function dep11() {
                 for comp in main contrib non-free; do
                     mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
                     cd ${dir}/${comp}
-                    rsync -aq --delete --delete-after --exclude ./*.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
+                    rsync -aq --delete --delete-after --exclude by-hash --exclude "./*.tmp" . ${ftpdir}/dists/${dir}/${comp}/dep11/.
                     cd ${dep11dir}
                 done
             fi
@@ -491,7 +491,7 @@ function mirror() {
 
         mkdir -p ${targetpath}
         cd ${targetpath}
-        rsync -aH --link-dest ${archiveroot} --delete --delete-after --delete-excluded --exclude Packages.*.new --exclude Sources.*.new  --ignore-errors ${archiveroot}/. .
+        rsync -aH --link-dest ${archiveroot} --delete --delete-after --delete-excluded --exclude "Packages.*.new" --exclude "Sources.*.new"  --ignore-errors ${archiveroot}/. .
     done
 }
 

diff --git a/config/homedir/ssh/ftpmaster-authorized_keys b/config/homedir/ssh/ftpmaster-authorized_keys
index 25f7b239e6d2975c8ce16a2221832b61791111a9..7dc3e50bbd4993fa4682e8702c1b5e80579b6f18 100644 (file)
--- a/config/homedir/ssh/ftpmaster-authorized_keys
+++ b/config/homedir/ssh/ftpmaster-authorized_keys
@@ -1,9 +1,9 @@
 # whenever we have to read a new dataset for testing/squeeze-updates this runs
-command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh testing",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAqvcRf4LLH9WLz3YGg/vj62I6aMihd9eF8tEYIMvRUNIqcI95YQP6nPpnIovom30RI9l5vJP+xpd0ABoiVxGDr0fw4hfp137BxpOL2WDHoqYX0KWP5mdWpA2PV2HVOJ4xp0q18pZ0DIdhxAGDd1QRrkR2yD9CH4dhRNcYRN8TA970y5Tweesh19Ba583f25NrSv0+A1200qiSdMbn9KIQYwC0Gc9xcKS1/Tygf2Sz3ekVrODog/nACPLbHRxO+mPcHJVBb9Sf8l393l5eln7ZfmSD0wZD6X/2M9+rRoXtVycLbmISxJV8zdady/3HCX33fcWCI7xCfOsikcVWDzygtQ== release@ries
-command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh testing-debug",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzWozNy2KZk8VQ1FWgS4TUoCVDOuTkBTrOxvUl7y677bgvbbzd7JAreLbVYRUKKfXdDCnEm3ypC1ejdJSTEmF8CZtdXw1ZSLcjJxyKzMLjhraoz5PJ3cYjUmz1W2i5ef/f4YEM+ue+PN4nEPPtCwjhGad6tCKUSxgKimuZMOt3O9aH4vSRUzN4UfK9n1d3X0whx/YKVUSN4aKq3L5iHuB1fUW0IIbJmZkT1tkudiuBxfy2IkNk3RnbCTzuhBgVV1gC5Xa/P0z9RC2ssdqsXo6pl+fatJFCcSXimPFAtvXHtKYu6XVRoh0dXlEGKQTuO66jtzkpHrKN2VDmNaPLQIqJ release@franck
-command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh squeeze-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs0CFETy4E2rR7sH5kl5tgPVltcimtdmkpWSYLO+AJrrTvN447KjL0GhAc9raWv/wp6UeGw9zhOOxH6UGGD2DKI+lIZKW2PraLnQMs9g67B7Q/7MH7rHIzKue1niOANgPZppQ18rdiexagWyj+E8z/A1cFqpfaIIupi543eXZ4yZV3fjrHIE6zTvIzoTzlAZ5IaCOYyFT8wx6Ql53aEZfMk6S1FvXou24wFBD08CArTjRMf2eYo/aPqWbJs955eZwNqp1kS4jtJKwc7DCKpY7elHCyIqfR7YZxTUOBEGpoaAIfjIitgEedZnuMmBl8IUi1jQ0HvM7HDb4n4NVR/hbew== release@franck
-command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh wheezy-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBFRjQe43ruKGoTUFUOD9B2RG6yKfd2H402ywB3m7kEUGgsE0CI6+qGO0J/xiY6P4CBSVH1uwUpxxKvFJbVTI6227O9+1LnpeNliKcHo3H0i//Or18f1+mL1zoHAGimFvDydtnbYiSstYOzzPfvkaf1HPOZtaBUO2HleARbGR2zFtjZ3R/2QKj7a3xNQ/AkFY+N8YquqqRh4gNY8vEPTCVgNl/jy4Kb7lDtHAfS8O6oxDkqVon2nPO4KTgawYXw90CyBZP2/it5JUg5Z19U0mjw0wJ0hP7fU6tuSOm16ClS3w0phXRSsRO+jj7ngdSEhCFklmVSQtbX0+k7hNQKM91 release@franck
-command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh jessie-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDxfl1ufQv7gtWZnFXCPdZKp3faa4sS3/LYLIcyojZkUMHLt05Rz4gKqU2XUdLXZ7BL9bfggC+O3OJu0uDQFgwAW8G+vwdLG9tSbCPJ4dLq2S1zS1Oe5ZLEmudDcQ6vVTv+zrzq8KAqsi1HvxctdSI/cDJV37zvStbgEhEQ1zURrZXgItxGNL07fxoVXBWpwSD7gPEzTBAc/+MPk/8krsF9wLXsVMGls8qxHmjyL1aBBItYOgUAdo5PMPy203+aO8BC5ExKzqMk/T6x/mvZ5IaWl0IgSvEizgO8Q07mpa8+A0p+uAiFe01rJpYaSdLsOnbr0gu+cBBMP1VEJzQw8sAB release@franck
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh testing",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAqvcRf4LLH9WLz3YGg/vj62I6aMihd9eF8tEYIMvRUNIqcI95YQP6nPpnIovom30RI9l5vJP+xpd0ABoiVxGDr0fw4hfp137BxpOL2WDHoqYX0KWP5mdWpA2PV2HVOJ4xp0q18pZ0DIdhxAGDd1QRrkR2yD9CH4dhRNcYRN8TA970y5Tweesh19Ba583f25NrSv0+A1200qiSdMbn9KIQYwC0Gc9xcKS1/Tygf2Sz3ekVrODog/nACPLbHRxO+mPcHJVBb9Sf8l393l5eln7ZfmSD0wZD6X/2M9+rRoXtVycLbmISxJV8zdady/3HCX33fcWCI7xCfOsikcVWDzygtQ== release@ries
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh testing-debug",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzWozNy2KZk8VQ1FWgS4TUoCVDOuTkBTrOxvUl7y677bgvbbzd7JAreLbVYRUKKfXdDCnEm3ypC1ejdJSTEmF8CZtdXw1ZSLcjJxyKzMLjhraoz5PJ3cYjUmz1W2i5ef/f4YEM+ue+PN4nEPPtCwjhGad6tCKUSxgKimuZMOt3O9aH4vSRUzN4UfK9n1d3X0whx/YKVUSN4aKq3L5iHuB1fUW0IIbJmZkT1tkudiuBxfy2IkNk3RnbCTzuhBgVV1gC5Xa/P0z9RC2ssdqsXo6pl+fatJFCcSXimPFAtvXHtKYu6XVRoh0dXlEGKQTuO66jtzkpHrKN2VDmNaPLQIqJ release@franck
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh squeeze-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs0CFETy4E2rR7sH5kl5tgPVltcimtdmkpWSYLO+AJrrTvN447KjL0GhAc9raWv/wp6UeGw9zhOOxH6UGGD2DKI+lIZKW2PraLnQMs9g67B7Q/7MH7rHIzKue1niOANgPZppQ18rdiexagWyj+E8z/A1cFqpfaIIupi543eXZ4yZV3fjrHIE6zTvIzoTzlAZ5IaCOYyFT8wx6Ql53aEZfMk6S1FvXou24wFBD08CArTjRMf2eYo/aPqWbJs955eZwNqp1kS4jtJKwc7DCKpY7elHCyIqfR7YZxTUOBEGpoaAIfjIitgEedZnuMmBl8IUi1jQ0HvM7HDb4n4NVR/hbew== release@franck
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh wheezy-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBFRjQe43ruKGoTUFUOD9B2RG6yKfd2H402ywB3m7kEUGgsE0CI6+qGO0J/xiY6P4CBSVH1uwUpxxKvFJbVTI6227O9+1LnpeNliKcHo3H0i//Or18f1+mL1zoHAGimFvDydtnbYiSstYOzzPfvkaf1HPOZtaBUO2HleARbGR2zFtjZ3R/2QKj7a3xNQ/AkFY+N8YquqqRh4gNY8vEPTCVgNl/jy4Kb7lDtHAfS8O6oxDkqVon2nPO4KTgawYXw90CyBZP2/it5JUg5Z19U0mjw0wJ0hP7fU6tuSOm16ClS3w0phXRSsRO+jj7ngdSEhCFklmVSQtbX0+k7hNQKM91 release@franck
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh jessie-updates",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDxfl1ufQv7gtWZnFXCPdZKp3faa4sS3/LYLIcyojZkUMHLt05Rz4gKqU2XUdLXZ7BL9bfggC+O3OJu0uDQFgwAW8G+vwdLG9tSbCPJ4dLq2S1zS1Oe5ZLEmudDcQ6vVTv+zrzq8KAqsi1HvxctdSI/cDJV37zvStbgEhEQ1zURrZXgItxGNL07fxoVXBWpwSD7gPEzTBAc/+MPk/8krsF9wLXsVMGls8qxHmjyL1aBBItYOgUAdo5PMPy203+aO8BC5ExKzqMk/T6x/mvZ5IaWl0IgSvEizgO8Q07mpa8+A0p+uAiFe01rJpYaSdLsOnbr0gu+cBBMP1VEJzQw8sAB release@franck
 
 # release team tpu removals
-command="/srv/ftp-master.debian.org/dak/scripts/debian/release_team_removals.sh",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw6DLpbCsiadOqxenRfW5In7UFG5HoIDt0xV/dRDbqNUUihNcDi6SqlREuSBCA75lOqbhL1w2tWsdsTIMnJeq3Fdr3LdFjIKlG6QQZVThaD3SI76EkGtjt0XQDoN2d4hi0Xn2LOPKz8hxaY4jKYzSUN0TVue3C1EHTJD0S8Grkd5tPaDgXt4pJzHmNwT4r2dH5OT3Y3vJL2UGhbY6Y+rNFfmnKzDcBtNdUTLTtrAfCCMkPITTYrMvZevA9u/SzNenN9qwEQicc06FrycSCi6+XSA+t4k1YNf1NTHhTQEncEX4/FRf+jgbkt1lkchiu+eShx3bUZCsKPuoNEsuWUU5v release@franck
+command="/srv/ftp-master.debian.org/dak/scripts/debian/release_team_removals.sh",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="138.16.160.12,franck.debian.org,5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw6DLpbCsiadOqxenRfW5In7UFG5HoIDt0xV/dRDbqNUUihNcDi6SqlREuSBCA75lOqbhL1w2tWsdsTIMnJeq3Fdr3LdFjIKlG6QQZVThaD3SI76EkGtjt0XQDoN2d4hi0Xn2LOPKz8hxaY4jKYzSUN0TVue3C1EHTJD0S8Grkd5tPaDgXt4pJzHmNwT4r2dH5OT3Y3vJL2UGhbY6Y+rNFfmnKzDcBtNdUTLTtrAfCCMkPITTYrMvZevA9u/SzNenN9qwEQicc06FrycSCi6+XSA+t4k1YNf1NTHhTQEncEX4/FRf+jgbkt1lkchiu+eShx3bUZCsKPuoNEsuWUU5v release@franck

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 5392259c6002ac20e15597c8123ef4eeb8ce63c3..c94fc1366e7c386cdd1195f3075f78ffc530a1fe 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -251,7 +251,7 @@ def set_suite(file, suite, transaction, britney=False, force=False):
             else:
                 transaction.copy_binary(pkg, suite, component)
 
-            Logger.log(["added", " ".join(key)])
+            Logger.log(["added", suite.suite_name, " ".join(key)])
 
     # Check to see which packages need removed and remove them
     for key, pkid in current.iteritems():
@@ -261,7 +261,7 @@ def set_suite(file, suite, transaction, britney=False, force=False):
                 session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid})
             else:
                 session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid})
-            Logger.log(["removed", " ".join(key), pkid])
+            Logger.log(["removed", suite.suite_name, " ".join(key), pkid])
 
     session.commit()
 

diff --git a/scripts/debian/dep11-basic-validate.py b/scripts/debian/dep11-basic-validate.py
index 03cd80c0c2b2845756483043fdb91b5f6ac1348b..6ee3042b11f096a88b6268e12c50a6ec69decaa1 100755 (executable)
--- a/scripts/debian/dep11-basic-validate.py
+++ b/scripts/debian/dep11-basic-validate.py
@@ -169,9 +169,13 @@ def validate_dir(dirname):
     ret = True
     for root, subfolders, files in os.walk(dirname):
         for fname in files:
-             if fname.endswith(".yml.gz") or fname.endswith(".yml.xz"):
-                 if not validate_file(os.path.join(root, fname)):
-                     ret = False
+            fpath = os.path.join(root, fname)
+            if os.path.islink(fpath):
+                add_issue("FATAL: Symlinks are not allowed")
+                return False
+            if fname.endswith(".yml.gz") or fname.endswith(".yml.xz"):
+                if not validate_file(fpath):
+                    ret = False
 
     return ret
 
@@ -187,6 +191,9 @@ def main():
 
     if os.path.isdir(fname):
         ret = validate_dir(fname)
+    elif os.path.islink(fname):
+        add_issue("FATAL: Symlinks are not allowed")
+        ret = False
     else:
         ret = validate_file(fname)
     if ret:

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 98e120762d6d17384a32db1e4dc936d34bccfecd..6eb39cacda49ec5c1ad7c8bd9f2fd0b860523f3b 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -31,31 +31,16 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 
 IMPORTSUITE=${1:-"testing"}
 BRITNEY=""
+MD5SUM="${SSH_ORIGINAL_COMMAND}"
 
 case "${IMPORTSUITE}" in
     testing)
-        # What file we look at.
-        INPUTFILE="/srv/release.debian.org/britney/Heidi/set/current"
         DO_CHANGELOG="true"
         ;;
     testing-debug)
-        # What file we look at.
-        INPUTFILE="/srv/release.debian.org/sets/testing-debug/current"
-        DO_CHANGELOG="false"
-        ;;
     squeeze-updates)
-        # What file we look at.
-        INPUTFILE="/srv/release.debian.org/sets/squeeze-updates/current"
-        DO_CHANGELOG="false"
-        ;;
     wheezy-updates)
-        # What file we look at.
-        INPUTFILE="/srv/release.debian.org/sets/wheezy-updates/current"
-        DO_CHANGELOG="false"
-        ;;
     jessie-updates)
-        # What file we look at.
-        INPUTFILE="/srv/release.debian.org/sets/jessie-updates/current"
         DO_CHANGELOG="false"
         ;;
     *)
@@ -74,7 +59,13 @@ if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     BRITNEY=" --britney"
 fi
 
-dak control-suite --set ${IMPORTSUITE} ${BRITNEY} < ${INPUTFILE}
+tmpfile=$(mktemp)
+trap "rm -f ${tmpfile}" EXIT
+cat > ${tmpfile}
+if ! echo "${MD5SUM}  ${tmpfile}" | md5sum -c --quiet; then
+    exit 42
+fi
+dak control-suite --set ${IMPORTSUITE} ${BRITNEY} < ${tmpfile}
 
 if [ "x${DO_CHANGELOG}x" = "xtruex" ]; then
     NOW=$(date "+%Y%m%d%H%M")