[SCM] morituri/master: use describe --all to always get a description

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Oct 19 20:10:16 UTC 2014


The following commit has been merged in the master branch:
commit c6161b35f9c825c8802a00f6d816bae105897963
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed Mar 26 09:44:19 2014 -0400

    use describe --all to always get a description

diff --git a/morituri/common/common.py b/morituri/common/common.py
index 1a30eaf..76efeea 100644
--- a/morituri/common/common.py
+++ b/morituri/common/common.py
@@ -351,14 +351,15 @@ def getRevision():
     # which may be higher than your current source tree
     if os.path.exists(os.path.join(topsrcdir, '.git')):
 
-        status, describe = commands.getstatusoutput('git describe')
+        # always falls back to the current commit hash if no tags are found
+        status, describe = commands.getstatusoutput('git describe --all')
         if status == 0:
             if commands.getoutput('git diff-index --name-only HEAD --'):
                 describe += '-modified'
 
             return describe
 
-    # check for a top-level REIVISION file
+    # check for a top-level REVISION file
     path = os.path.join(topsrcdir, 'REVISION')
     if os.path.exists(path):
         revision = open(path).read().strip()

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list