Merge lp:~marcustomlinson/update-manager/update-manager into lp:update-manager

[Marcus Tomlinson]

deb2snap: Don't replace debs that were manually installed via another package

[Brian Murray (brian-murray)]

Looks good to me, thanks!

review: Approve

[lp:~marcustomlinson/update-manager/update-manager]

2878. By Brian Murray on 2020-04-15

merge lp:~marcustomlinson/update-manager/update-manager

=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2020-04-07 12:00:12 +0000
+++ UpdateManager/backend/__init__.py	2020-04-15 12:37:40 +0000
@@ -122,8 +122,20 @@
         for snap, (deb, _) in seeded_snaps.items():
             # if the deb is installed and was not manually installed,
             # replace it
-            if (deb in cache and cache[deb].is_auto_installed):
-                duplicates.append(deb)
+            if (deb in cache and cache[deb].is_installed):
+                deb_is_auto = True
+                cache[deb].mark_delete()
+
+                for pkg in cache.get_changes():
+                    if (pkg.is_installed and pkg.marked_delete
+                       and not pkg.is_auto_installed):
+                        deb_is_auto = False
+                        break
+
+                cache.clear()
+
+                if deb_is_auto:
+                    duplicates.append(deb)
 
         return duplicates
 

=== modified file 'debian/changelog'
--- debian/changelog	2020-04-08 16:59:53 +0000
+++ debian/changelog	2020-04-15 12:37:40 +0000
@@ -1,3 +1,10 @@
+update-manager (1:20.04.6) focal; urgency=medium
+
+  * deb2snap: Don't replace debs that were manually installed via
+    another package (LP: #1872958).
+
+ -- Marcus Tomlinson <[e-mail]>  Wed, 15 Apr 2020 11:34:33 +0100
+
 update-manager (1:20.04.5) focal; urgency=medium
 
   * Fix TypeError crash in update() (LP: #1871490).