morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

devutils/update_platform_patches: move updated patches back

Browse Source
This commit is contained in:
jj
2025-02-25 22:29:54 +00:00
parent 20175cf817
commit d56c8d5677
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
devutils/update_platform_patches.py
View File

@@ -62,15 +62,17 @@ def _dir_empty(path):
return False
def _remove_files_with_dirs(root_dir, sorted_file_iter):
def _rename_files_with_dirs(root_dir, sorted_file_iter):
'''
Deletes a list of sorted files relative to root_dir, removing empty directories along the way
Moves a list of sorted files back to the upstream repo, removing empty directories along the way
'''
past_parent = None
upstream_path = Path(os.path.dirname(os.path.realpath(__file__))) / '../patches'
for partial_path in sorted_file_iter:
complete_path = Path(root_dir, partial_path)
complete_upstream_path = Path(upstream_path, partial_path)
try:
complete_path.unlink()
complete_path.rename(complete_upstream_path)
except FileNotFoundError:
get_logger().warning('Could not remove prepended patch: %s', complete_path)
if past_parent != complete_path.parent:
@@ -98,8 +100,8 @@ def unmerge_platform_patches(platform_patches_dir):
filter(len,
(platform_patches_dir / _SERIES_PREPEND).read_text(encoding=ENCODING).splitlines()))
# Remove prepended files with directories
_remove_files_with_dirs(platform_patches_dir, sorted(prepend_series))
# Move prepended files to original location, preserving changes, and clean up
_rename_files_with_dirs(platform_patches_dir, sorted(prepend_series))
# Determine positions of blank spaces in series.orig
if not (platform_patches_dir / _SERIES_ORIG).exists():