[Git][ftp-team/dak][master] 3 commits: Only need read access

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
```

@@ -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() {

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

@@ -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)