Skip to content

Commit 2a33943

Browse files
committed
fix: include last wine log in support package
Tested (on existing install pre-login): - ran logos twice, generated support zip, extracted support zip, saw last wine log present - ran logos, over wrote wine log with static value, ran logos again, confirmed static value present in log from previous logos run
1 parent bd36023 commit 2a33943

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

ou_dedetai/config.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,11 @@ def app_wine_log_path(self) -> str:
10481048
return self._overrides.app_wine_log_path
10491049
return constants.DEFAULT_APP_WINE_LOG_PATH
10501050

1051+
@property
1052+
def app_wine_log_previous_path(self) -> str:
1053+
wine_log = Path(self.app_wine_log_path)
1054+
return str(wine_log.with_suffix(".1" + wine_log.suffix))
1055+
10511056
@property
10521057
def app_log_path(self) -> str:
10531058
if self._overrides.app_log_path is not None:

ou_dedetai/control.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ def get_support(app: App) -> str:
124124
zip.write(app.conf.app_log_path)
125125
if Path(app.conf.app_wine_log_path).exists():
126126
zip.write(app.conf.app_wine_log_path)
127+
if Path(app.conf.app_wine_log_previous_path).exists():
128+
zip.write(app.conf.app_wine_log_previous_path)
127129
if Path("/etc/os-release").exists():
128130
zip.write("/etc/os-release")
129131
run_commands = [

ou_dedetai/wine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ def run_wine_application(
587587
Store the log in a dedicated file, keeping the previous log.
588588
"""
589589
current_log_path = Path(app.conf.app_wine_log_path)
590-
previous_log_path = current_log_path.with_suffix(".1" + current_log_path.suffix)
590+
previous_log_path = Path(app.conf.app_wine_log_previous_path)
591591
if current_log_path.exists():
592592
shutil.move(current_log_path, previous_log_path)
593593
with open(current_log_path, 'w') as wine_log:

0 commit comments

Comments
 (0)