Changeset 132ab5d1 in mainline for tools/config.py

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

tools/config.py

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