diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-06 04:27:12 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-06 04:27:12 (GMT) |
| commit | f70578f362c8c2c78036c9de846c20802ac7aa81 (patch) | |
| tree | f327de271f14382c0915677a87e53867785551f7 /tests/test_pretty_print.py | |
| parent | 32469374cfe2985f936f017a204d4e9d7dcd3e2f (diff) | |
| parent | 03be37d16b585e64de87118053206aaae06e7cf8 (diff) | |
Merge branch 'master' into epec-kernel
Diffstat (limited to 'tests/test_pretty_print.py')
| -rwxr-xr-x | tests/test_pretty_print.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/test_pretty_print.py b/tests/test_pretty_print.py index a2a04ed..ed86b65 100755 --- a/tests/test_pretty_print.py +++ b/tests/test_pretty_print.py @@ -62,13 +62,16 @@ def ezsearch(pattern,str): def read_gitinfo(): # won't work if run from outside of branch. - data = subprocess.Popen(['git','remote','-v'],stdout=subprocess.PIPE).stdout.read() - origin = ezsearch('^origin *?(.*?)\(fetch.*?$',data) - upstream = ezsearch('^upstream *?(.*?)\(fetch.*?$',data) - data = subprocess.Popen(['git','branch'],stdout=subprocess.PIPE).stdout.read() - branch = ezsearch('^\*(.*?)$',data) - out = 'Git branch: ' + branch + ' from origin ' + origin + '\n' - out += 'Git upstream: ' + upstream + '\n' + try: + data = subprocess.Popen(['git','remote','-v'],stdout=subprocess.PIPE).stdout.read() + origin = ezsearch('^origin *?(.*?)\(fetch.*?$',data) + upstream = ezsearch('^upstream *?(.*?)\(fetch.*?$',data) + data = subprocess.Popen(['git','branch'],stdout=subprocess.PIPE).stdout.read() + branch = ezsearch('^\*(.*?)$',data) + out = 'Git branch: ' + branch + ' from origin ' + origin + '\n' + out += 'Git upstream: ' + upstream + '\n' + except: + out = 'Problem running git' return out def read_sysinfo(filename): |