Updated Branches: refs/heads/4.1 edbd18d4c -> 5b4223a3b
Removing unused keyid variable, in favor of consolidating it into the certid var for the release prep build script Signed-off-by: Chip Childers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f579a1c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f579a1c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f579a1c Branch: refs/heads/4.1 Commit: 7f579a1c1bca3b3fb431e141604750d1530ffc91 Parents: edbd18d Author: Chip Childers <[email protected]> Authored: Sun Apr 21 15:18:02 2013 -0400 Committer: Chip Childers <[email protected]> Committed: Sun Apr 21 15:18:02 2013 -0400 ---------------------------------------------------------------------- tools/build/build_asf.sh | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f579a1c/tools/build/build_asf.sh ---------------------------------------------------------------------- diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index f3180fe..d3f7508 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -31,7 +31,6 @@ usage(){ echo " -o sets the output directory (defaults to $outputdir)" echo " -t tags the git repo with the version" echo " -u sets the certificate ID to sign the tag with (if not provided, the default key is attempted)" - echo " -k sets the key to sign the tarball with" echo " -h" } @@ -44,7 +43,6 @@ do b) branch="$OPTARG";; t) tag='yes';; u) certid="$OPTARG";; - k) keyid="--default-key $OPTARG";; h) usage exit 0;; /?) # unknown flag @@ -106,7 +104,11 @@ bzip2 $outputdir/apache-cloudstack-$version-src.tar cd $outputdir echo 'armor' -gpg -v $keyid --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 +if [$certid == 'X' ]; then + gpg -v --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 +else + gpg -v --default-key $certid --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 +fi echo 'md5' gpg -v --print-md MD5 apache-cloudstack-$version-src.tar.bz2 > apache-cloudstack-$version-src.tar.bz2.md5
