diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-10-21 11:08:25 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-28 22:20:16 +0100 |
commit | f91ba9a6655596d14e41e78301c4dd3aeb0a6b37 (patch) | |
tree | b55c169daa7889f0343ad6819713d5d0d7d2fb33 | |
parent | 3c0232c76029b92aee02037b09da588a7a8b440e (diff) |
lib/bpgit.py: enable extra arguments on git describe
Upstream commit: ea70308d746325654d44851be602fe02492b59f9
This lets us throw at it whatever extra stuff we want.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rwxr-xr-x | gentree.py | 5 | ||||
-rw-r--r-- | lib/bpgit.py | 10 |
2 files changed, 11 insertions, 4 deletions
@@ -468,9 +468,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None, backports_version = "(see git)" kernel_version = "(see git)" else: - backports_version = git.describe(tree=source_dir) + backports_version = git.describe(tree=source_dir, extra_args=['--long']) kernel_version = git.describe(rev=args.git_revision or 'HEAD', - tree=args.kerneldir) + tree=args.kerneldir, + extra_args=['--long']) f = open(os.path.join(args.outdir, 'versions'), 'w') f.write('BACKPORTS_VERSION="%s"\n' % backports_version) f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version) diff --git a/lib/bpgit.py b/lib/bpgit.py index 31b7de36..9a3f430b 100644 --- a/lib/bpgit.py +++ b/lib/bpgit.py @@ -27,8 +27,14 @@ def rev_parse(rev='HEAD', tree=None): raise SHAError() return sha -def describe(rev='HEAD', tree=None): - process = subprocess.Popen(['git', 'describe', '--always', '--long', rev], +def describe(rev='HEAD', tree=None, extra_args=[]): + cmd = ['git', 'describe', '--always'] + + cmd.extend(extra_args) + if rev is not None: + cmd.append(rev) + + process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True, universal_newlines=True, cwd=tree) stdout = process.communicate()[0] |