Commit a3354742 authored by moritz's avatar moritz
Browse files

Merge remote-tracking branch 'origin/master'

parents e07dba69 1f4dbd60
Pipeline #19193 passed with stages
in 6 minutes and 19 seconds
......@@ -4,9 +4,9 @@ from distutils.core import setup
import subprocess
# Write a version file containing the git hash and info
git_log = subprocess.check_output(['git', 'log', '-1', '--pretty=%h %ai'])
git_log = subprocess.check_output(['git', 'log', '-1', '--pretty=%h %ai']).decode('utf-8')
git_diff = (subprocess.check_output(['git', 'diff', '.'])
+ subprocess.check_output(['git', 'diff', '--cached', '.']))
+ subprocess.check_output(['git', 'diff', '--cached', '.'])).decode('utf-8')
if git_diff == '':
status = '(CLEAN) ' + git_log
else:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment