Repository: aurora Updated Branches: refs/heads/master 7a69ca22f -> 759ef6827
Improve GPG key validation for release verification script. Reviewed at https://reviews.apache.org/r/33997/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/759ef682 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/759ef682 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/759ef682 Branch: refs/heads/master Commit: 759ef68279c9d116a6dbfded45e0f6a09aadf02a Parents: 7a69ca2 Author: Joe Smith <[email protected]> Authored: Mon May 11 17:42:57 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Mon May 11 17:42:57 2015 -0700 ---------------------------------------------------------------------- build-support/release/verify-release-candidate | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/759ef682/build-support/release/verify-release-candidate ---------------------------------------------------------------------- diff --git a/build-support/release/verify-release-candidate b/build-support/release/verify-release-candidate index f96d7c9..7aa9c90 100755 --- a/build-support/release/verify-release-candidate +++ b/build-support/release/verify-release-candidate @@ -31,14 +31,9 @@ download_rc_file() { download_dist_file ${verify_version}/$1 } -maybe_import_gpg_keys() { - # Check and import the KEYS files - read -r -p "Import Apache Aurora GPG KEYS? [y/n]" response - response=${response,,} - if [[ $response =~ ^(yes|y| ) ]]; then - download_dist_file KEYS - gpg --import KEYS - fi +import_gpg_keys() { + download_dist_file KEYS + gpg --import KEYS } fetch_archive() { @@ -69,12 +64,10 @@ run_tests() { # TODO(wfarner): Share this with make-mesos-native-egg. setup_tempdir() { - TMPDIR="" cleanup() { if [[ -f Vagrantfile ]]; then vagrant destroy -f fi - cd / rm -fr "$TMPDIR" } trap cleanup EXIT @@ -94,7 +87,7 @@ setup_tempdir "aurora-$verify_version" echo "Working in sandbox $TMPDIR" cd $TMPDIR -maybe_import_gpg_keys +import_gpg_keys dist_name="apache-aurora-${verify_version}" fetch_archive $dist_name
