[Git][ftp-team/dak][deploy] 3 commits: Wrap debug output in try

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Git][ftp-team/dak][deploy] 3 commits: Wrap debug output in try

Mark Hymers-3
GitLab

Mark Hymers pushed to branch deploy at Debian FTP Team / dak

Commits:

  • 929312f8
    by Mark Hymers at 2019-09-07T12:07:54Z
    Wrap debug output in try
    
    Signed-off-by: Mark Hymers <[hidden email]>
    
  • 19f8fb36
    by Mark Hymers at 2019-09-07T12:07:58Z
    Fix handling of stretch
    
    Signed-off-by: Mark Hymers <[hidden email]>
    
  • 6c5bea49
    by Mark Hymers at 2019-09-07T12:08:14Z
    Merge branch 'master' into deploy
    

1 changed file:

Changes:

  • config/debian/pointrelease
    ... ... @@ -175,7 +175,16 @@ while :; do
    175 175
     done
    
    176 176
     
    
    177 177
     log "Merging the ${pusuite}-debug into ${suite}-debug"
    
    178
    -dak control-suite --add ${suite}-debug < ${pusuite}-debug.list
    
    178
    +while :; do
    
    179
    +    if dak control-suite --add ${suite}-debug < ${pusuite}-debug.list; then
    
    180
    +        log "Done"
    
    181
    +        break
    
    182
    +    else
    
    183
    +        log "Please check problem and hit enter when i can retry"
    
    184
    +        read
    
    185
    +    fi
    
    186
    +done
    
    187
    +
    
    179 188
     log "Cleaning ${pusuite} and ${pusuite}-debug"
    
    180 189
     dak control-suite --remove ${pusuite} < ${pusuite}.list
    
    181 190
     dak control-suite --remove ${pusuite}-debug < ${pusuite}-debug.list
    
    ... ... @@ -421,7 +430,8 @@ merge-release-signatures() {
    421 430
     merge-release-signatures $(get_archiveroot ftp-master) ${suite} Release.gpg Release Release-${newrev}.gpg
    
    422 431
     merge-release-signatures $(get_archiveroot debian-debug) ${suite}-debug Release.gpg Release Release-${newrev}-debug.gpg
    
    423 432
     if [ "${suitename}" = stretch ]; then
    
    424
    -    rm -f ${archiveroot}/dists/${suite}/InRelease ${archiveroot}/zzz-dists/${suite}/InRelease
    
    433
    +    rm -f $(get_archiveroot ftp-master)/dists/${suite}/InRelease $(get_archiveroot ftp-master)/zzz-dists/${suite}/InRelease
    
    434
    +    rm -f $(get_archiveroot debian-debug)/dists/${suite}-debug/InRelease $(get_archiveroot debian-debug)/zzz-dists/${suite}-debug/InRelease
    
    425 435
     else
    
    426 436
         merge-release-signatures $(get_archiveroot ftp-master) ${suite} InRelease "" InRelease-${newrev}.gpg
    
    427 437
         merge-release-signatures $(get_archiveroot debian-debug) ${suite}-debug InRelease "" InRelease-${newrev}-debug.gpg