From 74640efb3b1bfd17c51239c81fe1fb214ca95054 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 19 Nov 2019 12:51:46 +0000
Subject: Stop dnf-makecache.timer before starting upgrade (mga#25072).

---
 NEWS                     | 2 ++
 mgaapplet-upgrade-helper | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 240db824..7784b465 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- stop dnf-makecache.timer before starting upgrade (mga#25072)
+
 Version 3.24.1 - 1 August 2017, Rémi Verschelde
 
 - fix the context menu in mgaapplet
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index e709d8f3..c00dd3f7 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -207,6 +207,8 @@ sub upgrade() {
     run_program::raw({ detach => 1 }, 'xdg-screensaver', 'suspend', $xid);
     my $_w = before_leaving { run_program::raw({ detach => 1 }, 'xdg-screensaver', 'resume', $xid) };
    
+    run_program::run('systemctl', 'stop', 'dnf-makecache.timer');
+
     my $file = "$ENV{HOME}/.MgaOnline/urpmi.cfg.backup." . int(rand 100000);
     log::explanations("backuping urpmi configuration in $file");
     cp_af("$root/etc/urpmi/urpmi.cfg", $file);
-- 
cgit v1.2.1