1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve special case handler to work on Windows

Browse Source 
There were some issues with not finding the git executable and
trying to remove read-only files / files that are still held
by a process.

Change-Id: I7f587c4e96cff763cc0b3438d9ed2249da8f122f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-06-11 15:13:59 +02:00
parent c09e770a5d
commit 118e04013a
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util/cmake/special_case_helper.py
View File

@ -88,6 +88,8 @@ import os
import subprocess import subprocess
import filecmp import filecmp
import time import time
import typing
import stat
from shutil import copyfile from shutil import copyfile
from shutil import rmtree from shutil import rmtree
@ -136,8 +138,11 @@ def copyfile_log(src: str, dst: str, debug=False):
def check_if_git_in_path() -> bool: def check_if_git_in_path() -> bool:
is_win = os.name == 'nt'
for path in os.environ['PATH'].split(os.pathsep): for path in os.environ['PATH'].split(os.pathsep):
git_path = os.path.join(path, 'git') git_path = os.path.join(path, 'git')
if is_win:
git_path += '.exe'
if os.path.isfile(git_path) and os.access(git_path, os.X_OK): if os.path.isfile(git_path) and os.access(git_path, os.X_OK):
return True return True
return False return False
@ -187,6 +192,17 @@ def create_file_with_no_special_cases(original_file_path: str, no_special_cases_
write_content_to_file(no_special_cases_file_path, content_no_special_cases) write_content_to_file(no_special_cases_file_path, content_no_special_cases)
def rm_tree_on_error_handler(func: typing.Callable[..., None],
path: str, exception_info: tuple):
# If the path is read only, try to make it writable, and try
# to remove the path again.
if not os.access(path, os.W_OK):
os.chmod(path, stat.S_IWRITE)
func(path)
else:
print('Error while trying to remove path: {}. Exception: {}'.format(path, exception_info))
class SpecialCaseHandler(object): class SpecialCaseHandler(object):
def __init__(self, def __init__(self,
@ -275,14 +291,14 @@ class SpecialCaseHandler(object):
print('Git merge conflict resolution process failed. Exception: {}'.format(e)) print('Git merge conflict resolution process failed. Exception: {}'.format(e))
raise e raise e
finally: finally:
os.chdir(current_dir)
# Remove the temporary repo. # Remove the temporary repo.
try: try:
if not self.keep_temporary_files: if not self.keep_temporary_files:
rmtree(repo_absolute_path) rmtree(repo_absolute_path, onerror=rm_tree_on_error_handler)
except Exception as e: except Exception as e:
print(e) print('Error removing temporary repo. Exception: {}'.format(e))
os.chdir(current_dir)
def save_next_clean_file(self): def save_next_clean_file(self):
files_are_equivalent = filecmp.cmp(self.generated_file_path, self.post_merge_file_path) files_are_equivalent = filecmp.cmp(self.generated_file_path, self.post_merge_file_path)