← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~vorlon/cloud-init:lp.1959343 into cloud-init:main


Steve Langasek has proposed merging ~vorlon/cloud-init:lp.1959343 into cloud-init:main.

Requested reviews:
  cloud-init Commiters (cloud-init-dev)
Related bugs:
  Bug #1959343 in ubiquity (Ubuntu): "deprecation of the Canonical partner archive"

For more details, see:

>From Ubuntu 20.10 on, the partner archive is completely empty; we are now sunsetting it and should no longer put references to it (even commented out) in sources.list.

cloud-init currently uses a single sources.list template in its codebase, which would be used on all host releases of Ubuntu.  Since the partner archive still *exists* for Ubuntu 20.04 and earlier, despite being of limited use, removing this for all releases may not be the desired behavior; however, I'm not enthusiastic about writing new code to handle this in jinja for a small corner case unless told to do so.
Your team cloud-init Commiters is requested to review the proposed merge of ~vorlon/cloud-init:lp.1959343 into cloud-init:main.
diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl
index edb92f1..6f92867 100644
--- a/templates/sources.list.ubuntu.tmpl
+++ b/templates/sources.list.ubuntu.tmpl
@@ -43,13 +43,6 @@ deb {{mirror}} {{codename}}-updates multiverse
 deb {{mirror}} {{codename}}-backports main restricted universe multiverse
 # deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu {{codename}} partner
-# deb-src http://archive.canonical.com/ubuntu {{codename}} partner
 deb {{security}} {{codename}}-security main restricted
 # deb-src {{security}} {{codename}}-security main restricted
 deb {{security}} {{codename}}-security universe

Follow ups