[Git][ftp-team/dak][master] 2 commits: Point release script fixes

8a01d2a6

by Mark Hymers at 2020-09-26T11:22:19+01:00

Point release script fixes

Signed-off-by: Mark Hymers <mhy@debian.org>

be21d17e

by Joerg Jaspert at 2020-10-25T11:34:04+01:00

Merge branch 'mhy/pointrelease'

* mhy/pointrelease:
  Point release script fixes

@@ -202,7 +202,12 @@ cd ${ftpdir}/dists/${pusuite}
  mv -t "${pumorguedir}" -n -- *.changes
  if [[ -n ${skiplist} ]]; then
      for pack in ${skiplist}; do
 -        mv -t "${ftpdir}/dists/${pusuite}" ${pumorguedir}/${pack}_*.changes
 +        # In corner cases, we may not have the changes file to move back - don't crash
 +        if compgen -G ${pumorguedir}/${pack}_*.changes >/dev/null; then
 +            mv -t "${ftpdir}/dists/${pusuite}" ${pumorguedir}/${pack}_*.changes
 +        else
 +            echo 'W: No changes files for ${pumorguedir}/${pack}_*.changes - check this is expected'
 +        fi
      done
  fi
@@ -328,7 +333,7 @@ done
  read -e -p "Does the diff look ok? Enter anything if not, empty if yes (if nonempty, I will open an editor for you)" diffcheck
  if [[ -n ${diffcheck} ]]; then
      cd ${ftpdir}/dists/${suite}
 -    edit-changelog "" ../README ../../README ../../README.html
 +    edit-changelog "Opening changelog" ../README ../../README ../../README.html
      rm -f -- ./*~ ../*~ ../../*~ ./"#"*"#" ../"#"*"#" ../../"#"*"#"
  fi