Merge branch 'merge'

* merge:
  docstring
  move logic into a function
  more tidy ups for paths/variables
  use variables for paths
  allow p-a and p-u to take a directory to parse themselves

diff --combined config/debian/dinstall
index 94787d5c2b302e6e4bf76597db3308add3dd0a90,b6ed073a3c2c82f90046febc38d15b6cc921fcbc..4544d0a0daeb256e3ba38a5f2867560cf9c731d3
--- 1/config/debian/dinstall
--- 2/config/debian/dinstall
+++ b/config/debian/dinstall
@@@ -167,9 -167,8 +167,8 @@@ function i18n1() 
  # Process the accepted queue
  function accepted() {
      log "Processing queue/accepted"
-     cd "$accepted"
-     rm -f REPORT
-     dak process-accepted -pa *.changes > REPORT
+     rm -f "$accepted/REPORT"
+     dak process-accepted -pa -d "$accepted" > "$accepted/REPORT"
      cat REPORT | mail -s "Install for $(date +"%D - %R")" ftpmaster@ftp-master.debian.org
      chgrp debadmin REPORT
      chmod 664 REPORT
@@@ -385,11 -384,6 +384,11 @@@ function stage() 
      # it has to cd first!
      cd ${configdir}
  
 +      if [ -f "${LOCK_STOP}" ]; then
 +              log "${LOCK_STOP} exists, exiting immediately"
 +              exit 42
 +      fi
 +
      if [ "${ERR}" = "false" ]; then
          set +e
      fi
@@@ -403,11 -397,6 +402,11 @@@
  
      touch "${stagedir}/${FUNC}"
  
 +      if [ -f "${LOCK_STOP}" ]; then
 +              log "${LOCK_STOP} exists, exiting immediately"
 +              exit 42
 +      fi
 +
      if [ -n "${TIME}" ]; then
          ts "${TIME}"
      fi
@@@ -456,10 -445,6 +455,10 @@@ LOCK_ACCEPTED="$lockdir/unchecked.lock
  # from our point of view
  LOCK_BRITNEY="$lockdir/britney.lock"
  
 +# If this file exists we exit immediately after the currently running
 +# function is done
 +LOCK_STOP="$lockdir/archive.stop"
 +
  lockfile -l 3600 "${LOCK_DAILY}"
  trap cleanup EXIT ERR TERM HUP INT QUIT