x/packstack
Code Issues Proposed changes

[Enhancement] Added --version flag

Browse Source 
Change-Id: I4f90673ce4855ada405c4e93c9f4c2c08707e6fe
Fix: bz#1011691
This commit is contained in:
Francesco Vollero 2014-01-20 17:01:20 +01:00
parent b925471df2
commit db71879e94
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/release.sh
View File

@ -11,6 +11,7 @@ if [ "$1" = "release" ] ; then
SNAPTAG="" SNAPTAG=""
else else
SNAPTAG=$(git log --oneline | wc -l) SNAPTAG=$(git log --oneline | wc -l)
sed -i -e "s/SNAPTAG=None/SNAPTAG=${SNAPTAG}/g" packstack/version.py
fi fi
python setup.py setopt -o tag_build -s "$SNAPTAG" -c egg_info python setup.py setopt -o tag_build -s "$SNAPTAG" -c egg_info

3
packstack/installer/run_setup.py
View File

@ -20,6 +20,7 @@ import processors
import output_messages import output_messages
from .exceptions import FlagValidationError, ParamValidationError from .exceptions import FlagValidationError, ParamValidationError
from packstack import version
from packstack.modules.ospluginutils import gethostlist from packstack.modules.ospluginutils import gethostlist
from setup_controller import Controller from setup_controller import Controller
@ -702,7 +703,7 @@ def initCmdLineParser():
# Init parser and all general flags # Init parser and all general flags
usage = "usage: %prog [options] [--help]" usage = "usage: %prog [options] [--help]"
parser = OptionParser(usage) parser = OptionParser(usage=usage,version="%prog {0} {1}".format(version.release_string(), version.version_string()))
parser.add_option("--gen-answer-file", help="Generate a template of an answer file, using this option excludes all other options") parser.add_option("--gen-answer-file", help="Generate a template of an answer file, using this option excludes all other options")
parser.add_option("--answer-file", help="Runs the configuration in non-interactive mode, extracting all information from the \ parser.add_option("--answer-file", help="Runs the configuration in non-interactive mode, extracting all information from the \
configuration file. using this option excludes all other options") configuration file. using this option excludes all other options")

11
packstack/version.py
View File

@ -1,11 +1,14 @@
VERSION = ['2013', '2', '1'] VERSION = ['2014', '1', '1']
FINAL=False FINAL=False
RELEASE="Icehouse"
SNAPTAG=None
def release_string():
return RELEASE
def version_string(): def version_string():
if FINAL: if FINAL:
return '.'.join(filter(None, VERSION)) return '.'.join(filter(None, VERSION))
else: else:
return '.'.join(filter(None, VERSION))+"dev" return '.'.join(filter(None, VERSION))+"dev{0}".format(SNAPTAG)