Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:05:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] Minor formatting.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2023-09-07 20:23:46 +02:00
parent 1831bc6add
commit d566273583
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sdk/tools/winesync/winesync.py
View file

@ -35,7 +35,7 @@ class wine_sync:
self.reactos_src = input('Please enter the path to the reactos git tree: ') self.reactos_src = input('Please enter the path to the reactos git tree: ')
self.wine_src = input('Please enter the path to the wine git tree: ') self.wine_src = input('Please enter the path to the wine git tree: ')
self.wine_staging_src = input('Please enter the path to the wine-staging git tree: ') self.wine_staging_src = input('Please enter the path to the wine-staging git tree: ')
config['repos'] = { 'reactos' : self.reactos_src, config['repos'] = { 'reactos': self.reactos_src,
'wine': self.wine_src, 'wine': self.wine_src,
'wine-staging': self.wine_staging_src } 'wine-staging': self.wine_staging_src }
with open('winesync.cfg', 'w') as file_output: with open('winesync.cfg', 'w') as file_output:
@ -89,8 +89,8 @@ class wine_sync:
return wine_branch_name return wine_branch_name
# helper function for resolving wine tree path to reactos one # Helper function for resolving wine tree path to reactos one
# Note : it doesn't care about the fact that the file actually exists or not # Note: it doesn't care about the fact that the file actually exists or not
def wine_to_reactos_path(self, wine_path): def wine_to_reactos_path(self, wine_path):
if wine_path in self.module_cfg['files']: if wine_path in self.module_cfg['files']:
# we have a direct mapping # we have a direct mapping
@ -133,7 +133,7 @@ class wine_sync:
# check if we should care # check if we should care
new_reactos_path = self.wine_to_reactos_path(delta.new_file.path) new_reactos_path = self.wine_to_reactos_path(delta.new_file.path)
if not new_reactos_path is None: if not new_reactos_path is None:
warning_message += 'file ' + delta.new_file.path + ' is added to the wine tree !\n' warning_message += 'file ' + delta.new_file.path + ' is added to the wine tree!\n'
old_reactos_path = '/dev/null' old_reactos_path = '/dev/null'
else: else:
old_reactos_path = None old_reactos_path = None
@ -141,12 +141,12 @@ class wine_sync:
# check if we should care # check if we should care
old_reactos_path = self.wine_to_reactos_path(delta.old_file.path) old_reactos_path = self.wine_to_reactos_path(delta.old_file.path)
if not old_reactos_path is None: if not old_reactos_path is None:
warning_message += 'file ' + delta.old_file.path + ' is removed from the wine tree !\n' warning_message += 'file ' + delta.old_file.path + ' is removed from the wine tree!\n'
new_reactos_path = '/dev/null' new_reactos_path = '/dev/null'
else: else:
new_reactos_path = None new_reactos_path = None
elif delta.new_file.path.endswith('Makefile.in'): elif delta.new_file.path.endswith('Makefile.in'):
warning_message += 'file ' + delta.new_file.path + ' was modified !\n' warning_message += 'file ' + delta.new_file.path + ' was modified!\n'
# no need to warn that those are ignored, we just did. # no need to warn that those are ignored, we just did.
continue continue
else: else:
@ -210,7 +210,7 @@ class wine_sync:
print('Applied patches from wine commit ' + str(wine_commit.id)) print('Applied patches from wine commit ' + str(wine_commit.id))
if ignored_files: if ignored_files:
warning_message += 'WARNING : some files were ignored: ' + ' '.join(ignored_files) + '\n' warning_message += 'WARNING: some files were ignored: ' + ' '.join(ignored_files) + '\n'
if not in_staging: if not in_staging:
self.module_cfg['tags']['wine'] = str(wine_commit.id) self.module_cfg['tags']['wine'] = str(wine_commit.id)