[Git][ftp-team/dak][deploy] 2 commits: Do not overwrite existing list files, do not break if c-s dies

6ce5dbe8

by Joerg Jaspert at 2018-06-23T10:25:10+02:00

Do not overwrite existing list files, do not break if c-s dies

434e11dc

by Joerg Jaspert at 2018-06-23T10:26:07+02:00

Merge branch 'master' into deploy

* master:
  Do not overwrite existing list files, do not break if c-s dies

@@ -128,11 +128,19 @@ confirm
  log "Preparing"
  pg_timestamp pre_${suite}_${newrev}
 -dak control-suite -l ${pusuite} > ${pusuite}.list &
 -dak control-suite -l ${suite} > ${suite}.list &
 +if [[ ! -f ${pusuite}.list ]]; then
 +    dak control-suite -l ${pusuite} > ${pusuite}.list &
 +fi
 +if [[ ! -f ${suite}.list ]]; then
 +    dak control-suite -l ${suite} > ${suite}.list &
 +fi
  if [[ ${suitename} != jessie ]]; then
 -    dak control-suite -l ${suite}-debug > ${suite}-debug.list &
 -    dak control-suite -l ${pusuite}-debug > ${pusuite}-debug.list &
 +    if [[ ! -f ${suite}-debug.list ]]; then
 +        dak control-suite -l ${suite}-debug > ${suite}-debug.list &
 +    fi
 +    if [[ ! -f ${pusuite}-debug.list ]]; then
 +        dak control-suite -l ${pusuite}-debug > ${pusuite}-debug.list &
 +    fi
  fi
  wait
@@ -159,7 +167,12 @@ if [[ -n ${skiplist} ]]; then
  fi
  log "Merging ${pusuite} into ${suite}"
 -dak control-suite --add ${suite} < ${pusuite}.list
 +if dak control-suite --add ${suite} < ${pusuite}.list; then
 +    log "Done"
 +else
 +    log "Please check problem and hit enter when i can continue"
 +    read
 +fi
  if [[ ${suitename} != jessie ]]; then
      dak control-suite --add ${suite}-debug < ${pusuite}-debug.list
  fi