eka/webhook-catcher
1
0
Fork 0
mirror of https://github.com/EeeeKa/webhook-catcher.git synced 2025-08-03 07:57:23 +05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from EeeeKa/master

Browse Source 
Add auto checkout to branch after pull
This commit is contained in:
Дмитрий Рамазанов 2020-10-08 17:32:54 +05:00 committed by GitHub
commit d5a6fe1594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webhook-catcher
View File

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
# #
# Webhook-catcher v1.1 # Webhook-catcher v1.3
# #
import os import os
@ -32,7 +32,7 @@ from signal import signal, SIGHUP, SIGTERM
from pprint import pprint from pprint import pprint
PROG_NAME = "Webhook-catcher" PROG_NAME = "Webhook-catcher"
PROG_VERSION = "v1.1" PROG_VERSION = "v1.3"
PROG_DESCRIPTION = '\ PROG_DESCRIPTION = '\
Simple HTTP-server for processing webhooks from Github or Gogs portals.\n\ Simple HTTP-server for processing webhooks from Github or Gogs portals.\n\
\n\ \n\
@ -374,8 +374,17 @@ class WebHookWorker(object):
if os.path.isdir(repo['dir']): if os.path.isdir(repo['dir']):
result = subprocess.run([ result = subprocess.run([
"git", "--git-dir", os.path.join(repo['dir'], '.git'), "--work-tree", repo['dir'], "pull", "git", "--git-dir", os.path.join(repo['dir'], '.git'), "--work-tree", repo['dir'], "pull",
repo['remote'], repo['branch'], repo['remote'], repo['branch']
], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) ], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
if result.returncode == 0:
sub_result = subprocess.run([
"git", "--git-dir", os.path.join(repo['dir'], '.git'), "--work-tree", repo['dir'], "checkout",
repo['branch']
], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
result.stdout += sub_result.stdout
result.stderr += sub_result.stderr
result.returncode = sub_result.returncode
else: else:
result = subprocess.run([ result = subprocess.run([
"git", "clone", "--origin", repo['remote'], "--branch", repo['branch'], repo['url'], repo['dir'] "git", "clone", "--origin", repo['remote'], "--branch", repo['branch'], repo['url'], repo['dir']