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

Dont do qt6 transition when rebase in progress

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-25 13:53:10 +05:30
parent cee59dbf18
commit 0a18e51a32
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/git_post_checkout_hook.py
View File

@ -18,8 +18,9 @@ os.chdir(base)
if flags == '1': # A branch checkout
prev_branch, cur_branch = list(map(get_branch_name, (prev_rev, current_rev)))
rebase_in_progress = os.path.exists('.git/rebase-apply') or os.path.exists('.git/rebase-merge')
if {prev_branch, cur_branch} == {'master', 'qt6'}:
if {prev_branch, cur_branch} == {'master', 'qt6'} and not rebase_in_progress:
b = 'qt6' if cur_branch == 'qt6' else 'qt5'
for x in os.listdir(f'bypy/b/{b}'):
link = f'bypy/b/{x}'