From 37386e0c74ebd5d0d4001d1cb9f5b3f92d999e0a Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Tue, 27 Aug 2019 14:15:52 -0500 Subject: [PATCH] osclib/common: provide version_calcuate() and utilize by default. --- Makefile | 2 +- osclib/common.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c045abd1..a4ae6b87 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ install: for i in osc-*.py osclib; do ln -s $(pkgdatadir)/$$i $(DESTDIR)$(oscplugindir)/$$i; done for i in $(SUBDIRS); do $(MAKE) -C $$i install; done install -m 644 systemd/* $(DESTDIR)$(unitdir) - sed -i "s/VERSION = '.*'/VERSION = '$(VERSION)'/" \ + sed -i "s/VERSION = .*/VERSION = '$(VERSION)'/" \ $(DESTDIR)$(pkgdatadir)/osclib/common.py for i in $(pkgdata_BINS); do ln -s $(pkgdatadir)/$$i $(DESTDIR)$(bindir)/osrt-$${i%.*}; done install -m 755 script/* $(DESTDIR)$(bindir) diff --git a/osclib/common.py b/osclib/common.py index fcc9fde4..f44335f7 100644 --- a/osclib/common.py +++ b/osclib/common.py @@ -1,2 +1,14 @@ NAME = 'openSUSE-release-tools' -VERSION = '0.0.0-dev' + +def version_calculate(): + from os import path + if path.exists('.git'): + from osclib.git import describe + try: + return describe() + except FileNotFoundError: + pass # Fall through to final return. + + return '0.0.0-dev' + +VERSION = version_calculate()