Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix python invocation in git hooks

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-10 07:29:04 +05:30
parent d7828644f5
commit cd7e8891bd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/git_post_checkout_hook.py
View File

@ -9,15 +9,19 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
import os, subprocess, sys import os, subprocess, sys
prev_rev, current_rev, flags = [x.decode('utf-8') if isinstance(x, bytes) else x for x in sys.argv[1:]] prev_rev, current_rev, flags = [x.decode('utf-8') if isinstance(x, bytes) else x for x in sys.argv[1:]]
def get_branch_name(rev): def get_branch_name(rev):
return subprocess.check_output(['git', 'name-rev', '--name-only', rev]).decode('utf-8').strip() return subprocess.check_output(['git', 'name-rev', '--name-only', rev]).decode('utf-8').strip()
base = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) base = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
os.chdir(base) os.chdir(base)
if flags == '1': # A branch checkout if flags == '1': # A branch checkout
prev_branch, cur_branch = map(get_branch_name, (prev_rev, current_rev)) prev_branch, cur_branch = map(get_branch_name, (prev_rev, current_rev))
subprocess.check_call(['python', 'setup.py', 'gui', '--summary']) subprocess.check_call([sys.executable, 'setup.py', 'gui', '--summary'])
# Remove .pyc files as some of them might have been orphaned # Remove .pyc files as some of them might have been orphaned
for dirpath, dirnames, filenames in os.walk('.'): for dirpath, dirnames, filenames in os.walk('.'):
@ -25,4 +29,3 @@ if flags == '1': # A branch checkout
fpath = os.path.join(dirpath, f) fpath = os.path.join(dirpath, f)
if f.endswith('.pyc'): if f.endswith('.pyc'):
os.remove(fpath) os.remove(fpath)

4
setup/git_post_rewrite_hook.py
View File

@ -14,6 +14,4 @@ os.chdir(base)
action = [x.decode('utf-8') if isinstance(x, bytes) else x for x in sys.argv[1:]][0] action = [x.decode('utf-8') if isinstance(x, bytes) else x for x in sys.argv[1:]][0]
if action == 'rebase': if action == 'rebase':
subprocess.check_call(['python', 'setup.py', 'gui']) subprocess.check_call([sys.executable, 'setup.py', 'gui'])