[PATCH] [Kimchi 0/2] Add release number to Kimchi version
Aline Manera (2): Add release number to Kimchi version Update pkg-version script to work with submodules build-aux/pkg-version | 2 +- config.py.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.5.0
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- config.py.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.py.in b/config.py.in index 3ddae46..3c1c13a 100644 --- a/config.py.in +++ b/config.py.in @@ -31,13 +31,14 @@ kimchiLock = threading.Lock() __with_spice__ = "@withspice@" __version__ = "@kimchiversion@" +__release__ = "@kimchirelease@" # Storage pool constant for read-only pool types READONLY_POOL_TYPE = ['iscsi', 'scsi', 'mpath'] def get_kimchi_version(): - return __version__ + return "-".join([__version__, __release__]) def get_distros_store(): -- 2.5.0
While using git-submodules the directory .git will not exist. Instead of that, a file .git will be present. Update it to cover this scenario. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- build-aux/pkg-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/pkg-version b/build-aux/pkg-version index 749cf6c..3bbf505 100755 --- a/build-aux/pkg-version +++ b/build-aux/pkg-version @@ -41,7 +41,7 @@ AWK_RELEASE=' else if (NF == 4) print $2, $3, "git" substr($4, 2) }' -if [ ! -d .git ]; then +if [ ! -e .git ]; then PKG_VERSION=`cat VERSION` else PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION` -- 2.5.0
Reviewed-by: Paulo Vital <pvital@linux.vnet.ibm.com> On 02/24/2016 11:40 AM, Aline Manera wrote:
Aline Manera (2): Add release number to Kimchi version Update pkg-version script to work with submodules
build-aux/pkg-version | 2 +- config.py.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
participants (2)
-
Aline Manera -
Paulo Vital