summaryrefslogtreecommitdiffstats
path: root/build/util.py
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2013-08-09 20:49:06 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2013-08-09 21:10:47 +0200
commitaf0fa0ef78299bf6ecca42bffacccca2b28cf1c8 (patch)
tree7dbad25e0700241255f97d2688ee0eb234e1db06 /build/util.py
parentef21319f73774a5e92c6dbea91aeb3e94cbe6702 (diff)
Fixed tainted flag in revision number
Diffstat (limited to 'build/util.py')
-rw-r--r--build/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/util.py b/build/util.py
index 17530bc509..a27e6d4a0f 100644
--- a/build/util.py
+++ b/build/util.py
@@ -65,7 +65,7 @@ def get_git_revision():
return len(os.popen("git log --pretty=oneline --first-parent").read().splitlines())
def get_git_modified():
- modified_matcher = re.compile("^#.*modified: (?P<filename>.*?)$")
+ modified_matcher = re.compile("^#.*: (?P<filename>.*?)$") # note output might be translated
modified_files = []
for line in os.popen("git status").read().splitlines():
match = modified_matcher.match(line)
@@ -157,7 +157,7 @@ def write_build_header(path):
f = open(path, 'w')
try:
branch_name = get_branch_name()
- modified = get_modified() > 0
+ modified = len(get_modified()) > 0
# Do not emit BUILD_BRANCH on release branches.
if not branch_name.startswith('release'):
f.write('#define BUILD_BRANCH "%s"\n' % branch_name)