cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Chad Smith has proposed merging ~chad.smith/cloud-init:fix-make-tarball into cloud-init:master.

Commit message:
tools: Fix make-tarball cli tool usage and default tar.gz outfile

This tool is used to assist during the creation of ubuntu packages for 
release testing. make-tarball default outfile should be of the format:
cloud-ini_<release-version>.orig.tar.gz. fix make-tarball to accept
--help or -h for usage information.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/342761

Nish ran into issues that 
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:fix-make-tarball into cloud-init:master.

diff --git a/tools/make-tarball b/tools/make-tarball
index 3197689..2e823df 100755
--- a/tools/make-tarball
+++ b/tools/make-tarball
@@ -13,12 +13,14 @@ Usage: ${0##*/} [revision]
     create a tarball of revision (default HEAD)
 
     options:
-      -o | --output FILE   write to file
+      -h | --help		print usage
+      -o | --output FILE	write to file
+           --long		Use git describe --long for versioning
 EOF
 }
 
 short_opts="ho:v"
-long_opts="help,output:,long,verbose"
+long_opts="help,output:,long"
 getopt_out=$(getopt --name "${0##*/}" \
     --options "${short_opts}" --long "${long_opts}" -- "$@") &&
     eval set -- "${getopt_out}" || { Usage 1>&2; exit 1; }
@@ -27,6 +29,7 @@ long_opt=""
 while [ $# -ne 0 ]; do
     cur=$1; next=$2
     case "$cur" in
+        -h|--help) Usage; exit 0;;
         -o|--output) output=$next; shift;;
            --long) long_opt="--long";;
         --) shift; break;;
@@ -37,9 +40,9 @@ done
 rev=${1:-HEAD}
 version=$(git describe --abbrev=8 "--match=[0-9]*" ${long_opt} $rev)
 
-archive_base="cloud-init-$version"
+archive_base="cloud-init_$version"
 if [ -z "$output" ]; then
-    output="$archive_base.tar.gz"
+    output="$archive_base.orig.tar.gz"
 fi
 
 # when building an archiving from HEAD, ensure that there aren't any