mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Dont rebuild extensions during a rebase
This commit is contained in:
parent
fc8aa605a3
commit
5481f1f820
@ -18,6 +18,7 @@ if flags == '1': # A branch checkout
|
||||
|
||||
prev_branch, cur_branch = map(get_branch_name, (prev_rev, current_rev))
|
||||
is_qt5_transition = 'qt5' in (prev_branch, cur_branch)
|
||||
print ('Transitioning from', prev_branch, 'to', cur_branch)
|
||||
|
||||
if is_qt5_transition:
|
||||
# Remove compiled .ui files as they must be re-generated
|
||||
@ -27,6 +28,7 @@ if flags == '1': # A branch checkout
|
||||
os.remove(os.path.join(dirpath, f))
|
||||
|
||||
# Rebuild PyQt extensions
|
||||
if not os.path.exists('.git/rebase-merge'): # Dont rebuild if we are rebasing
|
||||
for ext in ('progress_indicator',):
|
||||
extdir = os.path.join('build', 'pyqt', ext)
|
||||
if os.path.exists(extdir):
|
||||
|
Loading…
x
Reference in New Issue
Block a user