SoniEx2
/
ganarchy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some errors

This commit is contained in:
SoniEx2 2019-04-16 23:06:16 -03:00
parent 385e734a52
commit a642e912d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ganarchy.py
View File

@ -167,7 +167,7 @@ def cron_target():
def handle_target(url, project_commit): def handle_target(url, project_commit):
branchname = hashlib.sha256(url.encode("utf-8")).hexdigest() branchname = hashlib.sha256(url.encode("utf-8")).hexdigest()
try: try:
pre_hash = subprocess.check_output(["git", "-C", cache_home, "show", branchname, "-s", "--format=%H", "--"], stderr=subprocess.DEVNULL) pre_hash = subprocess.check_output(["git", "-C", cache_home, "show", branchname, "-s", "--format=%H", "--"], stderr=subprocess.DEVNULL).decode("utf-8").strip()
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
pre_hash = None pre_hash = None
try: try:
@ -176,16 +176,16 @@ def cron_target():
# This may error for various reasons, but some are important: dead links, etc # This may error for various reasons, but some are important: dead links, etc
click.echo(e.output, err=True) click.echo(e.output, err=True)
return None return None
post_hash = subprocess.check_output(["git", "-C", cache_home, "show", branchname, "-s", "--format=%H", "--"], stderr=subprocess.DEVNULL) post_hash = subprocess.check_output(["git", "-C", cache_home, "show", branchname, "-s", "--format=%H", "--"], stderr=subprocess.DEVNULL).decode("utf-8").strip()
if not pre_hash: if not pre_hash:
pre_hash = post_hash pre_hash = post_hash
try: try:
count = subprocess.check_output(["git", "-C", cache_home, "rev-list", "--count", pre_hash + ".." + post_hash]) count = int(subprocess.check_output(["git", "-C", cache_home, "rev-list", "--count", pre_hash + ".." + post_hash, "--"]).decode("utf-8").strip())
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
count = 0 # force-pushed count = 0 # force-pushed
try: try:
subprocess.check_call(["git", "-C", cache_home, "merge-base", "--is-ancestor", project_commit, branchname], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) subprocess.check_call(["git", "-C", cache_home, "merge-base", "--is-ancestor", project_commit, branchname], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
return count, post_hash, subprocess.check_output(["git", "-C", cache_home, "show", branchname, "-s", "--format=%B", "--"], stderr=subprocess.DEVNULL) return count, post_hash, subprocess.check_output(["git", "-C", cache_home, "show", branchname, "-s", "--format=%B", "--"], stderr=subprocess.DEVNULL).decode("utf-8", "replace")
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
return None return None
os.makedirs(cache_home, exist_ok=True) os.makedirs(cache_home, exist_ok=True)