Changes in tools/config.py [0a0b3d8:476ac3b] in mainline

File:

• tools/config.py (modified) (1 diff)

tools/config.py

@@ -460 +460 @@
         
         try:
-                version = subprocess.Popen(['git', 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
+                version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].decode().split(':')
                 sys.stderr.write("ok\n")
         except:
-                version = None
+                version = [1, "unknown", "unknown"]
                 sys.stderr.write("failed\n")
         
-        if (not strip_rev_info) and (version is not None):
-                revision = version
+        if (not strip_rev_info) and (len(version) == 3):
+                revision = version[1]
+                if version[0] != 1:
+                        revision += 'M'
+                revision += ' (%s)' % version[2]
         else:
                 revision = None