diff --git a/mylar/helpers.py b/mylar/helpers.py index 29424df4..6443fad4 100755 --- a/mylar/helpers.py +++ b/mylar/helpers.py @@ -17,7 +17,7 @@ import time from operator import itemgetter import datetime import re - +import itertools import mylar def multikeysort(items, columns): diff --git a/mylar/versioncheck.py b/mylar/versioncheck.py index 22ce9d73..fa7b6326 100755 --- a/mylar/versioncheck.py +++ b/mylar/versioncheck.py @@ -78,6 +78,12 @@ def getVersion(): logger.error('Couldn\'t find latest installed version.') return None + #branch_history, err = runGit("log --oneline --pretty=format:'%h - %ar - %s' -n 5") + #bh = [] + #print ("branch_history: " + branch_history) + #bh.append(branch_history.split('\n')) + #print ("bh1: " + bh[0]) + cur_commit_hash = output.strip() if not re.match('^[a-z0-9]+$', cur_commit_hash):