From c976b3f574ab95deeab7fcd666d90e72443c39ff Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 18 Sep 2013 15:39:55 +0200 Subject: [PATCH] Remove splitting from git wrapper --- vcs.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vcs.py b/vcs.py index acb23e8..7e6c1a3 100644 --- a/vcs.py +++ b/vcs.py @@ -32,14 +32,14 @@ def get_non_digit_prefix(val): class GitCommand: def __getattr__(self, name): - def call(*args, suppress_stderr = False, split = True): + def call(*args, suppress_stderr = False): cmd = ["git", name.replace('_', '-')] + list(args) with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE if suppress_stderr else None) as p: (stdout, stderr) = p.communicate() if p.returncode != 0: raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode)) stdout = stdout.decode('utf-8').strip('\n') - return stdout.split('\n') if split else stdout + return stdout return call git = GitCommand() @@ -85,19 +85,19 @@ class Git: git.submodule("update", "--init", "--recursive", "--rebase") # done print("...done", end=' ') - if git.rev_parse("HEAD", split=False) != git.rev_parse(self.commit, split=False): + if git.rev_parse("HEAD") != git.rev_parse(self.commit): print("(keeping local patches around)", end=' ') print() def version(self): - v = git.describe(split=False) + v = git.describe() return v[len(get_non_digit_prefix(v)):] # remove the non-digit prefix from v (so that it starts with a number) def checkVersions(self): self.update(mode = MODE_FETCH) - currentVersion = git.describe(split=False) + currentVersion = git.describe() # get sorted list of tag names with the same non-digit prefix and higher version number - tags = git.tag() + tags = git.tag().split('\n') tags = [t for t in tags if get_non_digit_prefix(t) == get_non_digit_prefix(currentVersion) and natural_sort_key(t) > natural_sort_key(currentVersion)] if not tags: return tags.sort(key = natural_sort_key) -- 2.30.2