Skip to content

Commit f6a4d8b

Browse files
committed
Fix logging/history for flatpak and cinnamon updates.
Cinnamon's history file was moved in linuxmint/cinnamon@323b5aa3f. We never wrote cinnamon or flatpak updates to the activity log (Information menu item). Fixes #859
1 parent bd5a64e commit f6a4d8b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

usr/lib/linuxmint/mintUpdate/flatpak-update-worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@ def start_updates(self):
268268
def _execute_finished(self, task):
269269
self.error = task.error_message
270270
if task.error_message is not None:
271-
self.write_to_log(task)
272271
self.send_to_updater(f"error:{task.error_message}")
273272
else:
274273
self.send_to_updater("done")
274+
self.write_to_log(task)
275275
self.quit()
276276

277277
def write_to_log(self, task):

usr/lib/linuxmint/mintUpdate/mintUpdate.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ def open_history(self, widget):
13551355
model.set_value(iter, COL_TYPE, _("package"))
13561356

13571357
if CINNAMON_SUPPORT:
1358-
logfile = '%s/.cinnamon/harvester.log' % os.path.expanduser("~")
1358+
logfile = os.path.join(GLib.get_user_state_dir(), 'cinnamon', 'harvester.log')
13591359
if os.path.isfile(logfile):
13601360
cinnamon_updates += subprocess.run('grep " upgrade " -sh %s' % logfile,
13611361
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, shell=True)\
@@ -2472,10 +2472,12 @@ def install(self, widget):
24722472
update = model.get_value(iter, UPDATE_OBJ)
24732473
if update.type == "cinnamon":
24742474
self.spices.append(update)
2475+
self.logger.write("Will install spice " + str(update.uuid))
24752476
iter = model.iter_next(iter)
24762477
continue
24772478
elif update.type == "flatpak":
24782479
self.flatpaks.append(update)
2480+
self.logger.write("Will install flatpak " + str(update.ref_name))
24792481
iter = model.iter_next(iter)
24802482
continue
24812483
if update.type == "kernel":

0 commit comments

Comments
 (0)