Merge ubuntu-release-upgrader:lp.1959343 into ubuntu-release-upgrader:ubuntu/master

[Steve Langasek]

[Brian Murray (brian-murray)]

I uploaded this after sorting out the autopkgtest fallout of these changes.

diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
index 552678d..38f1a70 100644
--- a/DistUpgrade/DistUpgradeController.py
+++ b/DistUpgrade/DistUpgradeController.py
@@ -1,6 +1,6 @@
 # DistUpgradeController.py 
 #  
-#  Copyright (c) 2004-2008 Canonical
+#  Copyright (c) 2004-2022 Canonical Ltd.
 #  
 #  Author: Michael Vogt <[e-mail]>
 # 
@@ -550,6 +550,18 @@ class DistUpgradeController(object):
             if entry.line.startswith(
                     "## developers who want to ship their latest software."):
                 continue
+            if ('/archive.canonical.com' in entry.line or
+                entry.line.startswith(
+                    "## Uncomment the following two lines to add software from Canonical's") or
+                entry.line.startswith(
+                    "## 'partner' repository.") or
+                entry.line.startswith(
+                    "## This software is not part of Ubuntu, but is offered by Canonical and the") or
+                entry.line.startswith(
+                    "## respective vendors as a service to Ubuntu users")
+               ):
+                continue
+
             new_list.append(entry)
         self.sources.list = new_list
 
diff --git a/debian/changelog b/debian/changelog
index 3f16e11..450d803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:22.04.3ubuntu1) UNRELEASED; urgency=medium
+
+  * DistUpgrade/DistUpgradeController.py: remove references to
+    archive.canonical.com from sources.list on upgrade.  LP: #1959343.
+
+ -- Steve Langasek <[e-mail]>  Thu, 27 Jan 2022 23:18:00 -0800
+
 ubuntu-release-upgrader (1:22.04.3) jammy; urgency=medium
 
   * DistUpgrade/DistUpgradeController.py: switch from using os.readlink to