diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-28 19:16:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-28 19:16:20 +0200 |
| commit | 0748bd989df4e474a7c045b5f41a4eb704434c70 (patch) | |
| tree | a1dbecffe0ef5cb88b01b2488c48bff5bdf54983 /contrib | |
| parent | 99f834842aba42fe14fc1bbd28faf6f58c797bc4 (diff) | |
release: cleanup temporary release-branch and avoid prompt for ftpadmin install
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fedora/rpm/release.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index f25dfdc572..465e763f1d 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -243,6 +243,8 @@ BUILD_TAG= CLEANUP_CHECKOUT_BRANCH="$CUR_BRANCH" +CLEANUP_REFS+=("$TMP_BRANCH") + case "$RELEASE_MODE" in minor) git checkout -B "$TMP_BRANCH" @@ -315,7 +317,7 @@ fi if [ -n "$RELEASE_FILE" ]; then do_command rsync -va --append-verify -P "/tmp/$RELEASE_FILE" master.gnome.org: || die "failed to rsync \"/tmp/$RELEASE_FILE\"" - do_command ssh master.gnome.org ftpadmin install "$RELEASE_FILE" || die "ftpadmin install failed" + do_command ssh master.gnome.org ftpadmin install --unattended "$RELEASE_FILE" || die "ftpadmin install failed" fi git checkout -B "$CUR_BRANCH" "$TMP_BRANCH" || die "cannot checkout $CUR_BRANCH" |