Changeset 0a0b3d8 in mainline

Timestamp:

2017-11-13T21:26:59Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e8f9bf0

Parents:

0dd4779

Message:

Make tools/*.py scripts Git aware

Location:

tools

Files:

• config.py (modified) (1 diff)
• dest_build.py (modified) (1 diff)
• imgutil.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

tools/dest_build.py

@@ -38 +38 @@
 import subprocess
 
-exclude_names = set(['.svn', '.bzr'])
+exclude_names = set(['.svn', '.bzr', '.git'])
 
 def duplicate_tree(src_path, dest_path, current):

tools/imgutil.py

@@ -36 +36 @@
 import stat
 
-exclude_names = set(['.svn', '.bzr'])
+exclude_names = set(['.svn', '.bzr', '.git'])
 
 def align_up(size, alignment):