[Git][ftp-team/dak][deploy] 5 commits: Only need read access

Joerg Jaspert pushed to branch deploy at Debian FTP Team / dak

Commits:

298e1da9
by Joerg Jaspert at 2018-04-24T09:01:43+02:00
```
Only need read access
```
b62d982c
by Joerg Jaspert at 2018-04-24T09:28:39+02:00
```
Be more verbose when not able to get lock
```
05de3a5c
by Joerg Jaspert at 2018-04-24T09:29:21+02:00
```
Unset trap at end of dinstall
```

650b4f1e

by Joerg Jaspert at 2018-04-25T22:56:05+02:00

Release the unchecked lock before calling cronscript

it does take it itself...

5c3aa4f8

by Joerg Jaspert at 2018-04-25T22:56:52+02:00

Merge branch 'master' into deploy

* master:
  Release the unchecked lock before calling cronscript
  Unset trap at end of dinstall
  Be more verbose when not able to get lock
  Only need read access

Changes:

config/debian-security/cron.unchecked

@@ -104,6 +104,7 @@ fi
  if [[ "${old_last_changed}" != "${new_last_changed}" ]]; then
      # We had something approved from a policy queue, push out new archive
 +    exec {LOCKFD}>&-
      $configdir/cronscript unchecked-dinstall
  fi

config/debian/cronscript

@@ -123,7 +123,20 @@ function lock() {
          TIME=300
      fi
      # Now try to get the lock
 -    flock ${flockparm} --timeout ${TIME} ${LOCKFD[${LOCK}]}
 +    set +e
 +    flock ${flockparm} --timeout ${TIME} --conflict-exit-code 3 ${LOCKFD[${LOCK}]}
 +    ret=$?
 +    set -e
 +    case ${ret} in
 +        0)
 +            return
 +            ;;
 +        3)
 +            log_error "Could not get lock ${lvar}, timeout"
 +            ;;
 +        *)
 +            log_error "Could not get lock ${lvar}"
 +    esac
+ }
  function unlock() {

config/debian/dinstall.functions

@@ -642,6 +642,7 @@ function startup() {
+ }
  function postcronscript() {
 +    trap - ERR
      logstats ${LOGFILE}
      state "all done"
      touch "${DINSTALLEND}"

dak/new_security_install.py

@@ -89,7 +89,7 @@ def sudo(arg, fn, exit):
  def do_Approve(): sudo("A", _do_Approve, True)
  def _do_Approve():
      print "Locking unchecked"
 -    with os.fdopen(os.open('/srv/security-master.debian.org/lock/unchecked.lock', os.O_CREAT | os.O_RDWR ), 'w') as lock_fd:
 +    with os.fdopen(os.open('/srv/security-master.debian.org/lock/unchecked.lock', os.O_CREAT | os.O_RDWR ), 'r') as lock_fd:
          while True:
              try:
                  fcntl.flock(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)