From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v6 proxmox-apt 08/11] update for bullseye
Date: Fri, 11 Jun 2021 13:43:57 +0200 [thread overview]
Message-ID: <20210611114418.28772-9-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210611114418.28772-1-f.ebner@proxmox.com>
and also adapt the tests.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
New in v6.
src/repositories/check.rs | 24 +++++++++----------
tests/repositories.rs | 4 ++--
tests/sources.list.d.expected/case.sources | 4 ++--
.../sources.list.d.expected/multiline.sources | 2 +-
| 4 ++--
.../pbs-enterprise.list | 2 +-
tests/sources.list.d.expected/pve.list | 12 +++++-----
tests/sources.list.d.expected/standard.list | 6 ++---
.../sources.list.d.expected/standard.sources | 4 ++--
tests/sources.list.d/case.sources | 4 ++--
tests/sources.list.d/multiline.sources | 2 +-
| 4 ++--
tests/sources.list.d/pbs-enterprise.list | 2 +-
tests/sources.list.d/pve.list | 12 +++++-----
tests/sources.list.d/standard.list | 6 ++---
tests/sources.list.d/standard.sources | 4 ++--
16 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/repositories/check.rs b/src/repositories/check.rs
index e0ec93e..689b48d 100644
--- a/src/repositories/check.rs
+++ b/src/repositories/check.rs
@@ -6,34 +6,34 @@ use crate::types::{
};
/// The (code)names of old Debian releases.
-pub const OLD_SUITES: [&str; 7] = [
+pub const OLD_SUITES: [&str; 8] = [
"lenny",
"squeeze",
"wheezy",
"jessie",
"stretch",
+ "buster",
"oldoldstable",
"oldstable",
];
/// The codename of the current stable Debian release.
-pub const STABLE_SUITE: &str = "buster";
+pub const STABLE_SUITE: &str = "bullseye";
/// The codename of the next stable Debian release.
-pub const NEXT_STABLE_SUITE: &str = "bullseye";
+pub const NEXT_STABLE_SUITE: &str = "bookworm";
/// The (code)names of new/testing Debian releases.
-pub const NEW_SUITES: [&str; 6] = [
- "bookworm",
- "trixie",
- "testing",
- "unstable",
- "sid",
- "experimental",
-];
+pub const NEW_SUITES: [&str; 5] = ["trixie", "testing", "unstable", "sid", "experimental"];
/// Splits the suite into its base part and variant.
pub fn suite_variant(suite: &str) -> (&str, &str) {
- let variants = ["-backports-sloppy", "-backports", "-updates", "/updates"];
+ let variants = [
+ "-backports-sloppy",
+ "-backports",
+ "-updates",
+ "/updates",
+ "-security",
+ ];
for variant in variants.iter() {
if let Some(base) = suite.strip_suffix(variant) {
diff --git a/tests/repositories.rs b/tests/repositories.rs
index ee7f1a8..4b287b5 100644
--- a/tests/repositories.rs
+++ b/tests/repositories.rs
@@ -267,8 +267,8 @@ fn test_common_digest() -> Result<(), Error> {
standard_file.parse()?;
let expected_digest = [
- 187, 82, 67, 137, 156, 156, 49, 84, 1, 221, 240, 24, 193, 201, 247, 252, 6, 128, 137, 241,
- 169, 176, 78, 193, 4, 190, 117, 136, 96, 28, 46, 78,
+ 150, 249, 15, 114, 233, 199, 154, 68, 39, 40, 212, 214, 227, 141, 121, 90, 236, 12, 147,
+ 203, 201, 250, 56, 104, 55, 42, 253, 63, 15, 177, 247, 237,
];
let mut files = vec![pve_file, standard_file];
diff --git a/tests/sources.list.d.expected/case.sources b/tests/sources.list.d.expected/case.sources
index 307aab6..0c71323 100644
--- a/tests/sources.list.d.expected/case.sources
+++ b/tests/sources.list.d.expected/case.sources
@@ -1,7 +1,7 @@
# comment in here
Types: deb deb-src
URIs: http://ftp.at.debian.org/debian
-Suites: buster-updates
+Suites: bullseye-updates
Components: main contrib
languages: it de fr
Enabled: false
@@ -11,6 +11,6 @@ languages-Remove: de
# comment in here
Types: deb deb-src
URIs: http://ftp.at.debian.org/debian
-Suites: buster
+Suites: bullseye
Components: main contrib
diff --git a/tests/sources.list.d.expected/multiline.sources b/tests/sources.list.d.expected/multiline.sources
index d96acea..fa7a9e9 100644
--- a/tests/sources.list.d.expected/multiline.sources
+++ b/tests/sources.list.d.expected/multiline.sources
@@ -1,7 +1,7 @@
# comment in here
Types: deb deb-src
URIs: http://ftp.at.debian.org/debian
-Suites: buster buster-updates
+Suites: bullseye bullseye-updates
Components: main contrib
Languages: it de fr
Enabled: false
--git a/tests/sources.list.d.expected/options_comment.list b/tests/sources.list.d.expected/options_comment.list
index 8c905c0..caef5e0 100644
--- a/tests/sources.list.d.expected/options_comment.list
+++ b/tests/sources.list.d.expected/options_comment.list
@@ -1,6 +1,6 @@
# comment
-deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian buster main contrib
+deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian bullseye main contrib
# non-free :(
-deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian buster non-free
+deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian bullseye non-free
diff --git a/tests/sources.list.d.expected/pbs-enterprise.list b/tests/sources.list.d.expected/pbs-enterprise.list
index acb2990..cb6e779 100644
--- a/tests/sources.list.d.expected/pbs-enterprise.list
+++ b/tests/sources.list.d.expected/pbs-enterprise.list
@@ -1,2 +1,2 @@
-deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise
+deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
diff --git a/tests/sources.list.d.expected/pve.list b/tests/sources.list.d.expected/pve.list
index 805cef7..222bb10 100644
--- a/tests/sources.list.d.expected/pve.list
+++ b/tests/sources.list.d.expected/pve.list
@@ -1,15 +1,15 @@
-deb http://ftp.debian.org/debian buster main contrib
+deb http://ftp.debian.org/debian bullseye main contrib
-deb http://ftp.debian.org/debian buster-updates main contrib
+deb http://ftp.debian.org/debian bullseye-updates main contrib
# PVE pve-no-subscription repository provided by proxmox.com,
# NOT recommended for production use
-deb http://download.proxmox.com/debian/pve buster pve-no-subscription
+deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription
-# deb https://enterprise.proxmox.com/debian/pve buster pve-enterprise
+# deb https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise
-deb-src https://enterprise.proxmox.com/debian/pve buster pve-enterprise
+deb-src https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise
# security updates
-deb http://security.debian.org/debian-security buster/updates main contrib
+deb http://security.debian.org/debian-security bullseye-security main contrib
diff --git a/tests/sources.list.d.expected/standard.list b/tests/sources.list.d.expected/standard.list
index 63c1b60..51f7ed0 100644
--- a/tests/sources.list.d.expected/standard.list
+++ b/tests/sources.list.d.expected/standard.list
@@ -1,7 +1,7 @@
-deb http://ftp.at.debian.org/debian buster main contrib
+deb http://ftp.at.debian.org/debian bullseye main contrib
-deb http://ftp.at.debian.org/debian buster-updates main contrib
+deb http://ftp.at.debian.org/debian bullseye-updates main contrib
# security updates
-deb http://security.debian.org buster/updates main contrib
+deb http://security.debian.org bullseye-security main contrib
diff --git a/tests/sources.list.d.expected/standard.sources b/tests/sources.list.d.expected/standard.sources
index 56ce280..85539b3 100644
--- a/tests/sources.list.d.expected/standard.sources
+++ b/tests/sources.list.d.expected/standard.sources
@@ -1,11 +1,11 @@
Types: deb
URIs: http://ftp.at.debian.org/debian
-Suites: buster buster-updates
+Suites: bullseye bullseye-updates
Components: main contrib
# security updates
Types: deb
URIs: http://security.debian.org
-Suites: buster/updates
+Suites: bullseye-security
Components: main contrib
diff --git a/tests/sources.list.d/case.sources b/tests/sources.list.d/case.sources
index 8979d0c..1a69d14 100644
--- a/tests/sources.list.d/case.sources
+++ b/tests/sources.list.d/case.sources
@@ -1,6 +1,6 @@
tYpeS: deb deb-src
uRis: http://ftp.at.debian.org/debian
-suiTes: buster-updates
+suiTes: bullseye-updates
# comment in here
CompOnentS: main contrib
languages: it
@@ -12,6 +12,6 @@ languages-Remove: de
types: deb deb-src
Uris: http://ftp.at.debian.org/debian
-suites: buster
+suites: bullseye
# comment in here
components: main contrib
diff --git a/tests/sources.list.d/multiline.sources b/tests/sources.list.d/multiline.sources
index bdbce29..683e7e5 100644
--- a/tests/sources.list.d/multiline.sources
+++ b/tests/sources.list.d/multiline.sources
@@ -1,6 +1,6 @@
Types: deb deb-src
URIs: http://ftp.at.debian.org/debian
-Suites: buster buster-updates
+Suites: bullseye bullseye-updates
# comment in here
Components: main contrib
Languages: it
--git a/tests/sources.list.d/options_comment.list b/tests/sources.list.d/options_comment.list
index 6b73053..7cc810e 100644
--- a/tests/sources.list.d/options_comment.list
+++ b/tests/sources.list.d/options_comment.list
@@ -1,3 +1,3 @@
-deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian buster main contrib # comment
-deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian buster non-free # non-free :(
+deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian bullseye main contrib # comment
+deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian bullseye non-free # non-free :(
diff --git a/tests/sources.list.d/pbs-enterprise.list b/tests/sources.list.d/pbs-enterprise.list
index 5f8763c..4592181 100644
--- a/tests/sources.list.d/pbs-enterprise.list
+++ b/tests/sources.list.d/pbs-enterprise.list
@@ -1 +1 @@
-deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise
+deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
diff --git a/tests/sources.list.d/pve.list b/tests/sources.list.d/pve.list
index 2c09f15..9da86a3 100644
--- a/tests/sources.list.d/pve.list
+++ b/tests/sources.list.d/pve.list
@@ -1,12 +1,12 @@
-deb http://ftp.debian.org/debian buster main contrib
-deb http://ftp.debian.org/debian buster-updates main contrib
+deb http://ftp.debian.org/debian bullseye main contrib
+deb http://ftp.debian.org/debian bullseye-updates main contrib
# PVE pve-no-subscription repository provided by proxmox.com,
# NOT recommended for production use
-deb http://download.proxmox.com/debian/pve buster pve-no-subscription
-# deb https://enterprise.proxmox.com/debian/pve buster pve-enterprise
+deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription
+# deb https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise
-deb-src https://enterprise.proxmox.com/debian/pve buster pve-enterprise
+deb-src https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise
# security updates
-deb http://security.debian.org/debian-security buster/updates main contrib
+deb http://security.debian.org/debian-security bullseye-security main contrib
diff --git a/tests/sources.list.d/standard.list b/tests/sources.list.d/standard.list
index 26db887..5fc952e 100644
--- a/tests/sources.list.d/standard.list
+++ b/tests/sources.list.d/standard.list
@@ -1,6 +1,6 @@
-deb http://ftp.at.debian.org/debian buster main contrib
+deb http://ftp.at.debian.org/debian bullseye main contrib
-deb http://ftp.at.debian.org/debian buster-updates main contrib
+deb http://ftp.at.debian.org/debian bullseye-updates main contrib
# security updates
-deb http://security.debian.org buster/updates main contrib
+deb http://security.debian.org bullseye-security main contrib
diff --git a/tests/sources.list.d/standard.sources b/tests/sources.list.d/standard.sources
index 605202e..0b0e83e 100644
--- a/tests/sources.list.d/standard.sources
+++ b/tests/sources.list.d/standard.sources
@@ -1,10 +1,10 @@
Types: deb
URIs: http://ftp.at.debian.org/debian
-Suites: buster buster-updates
+Suites: bullseye bullseye-updates
Components: main contrib
# security updates
Types: deb
URIs: http://security.debian.org
-Suites: buster/updates
+Suites: bullseye-security
Components: main contrib
--
2.20.1
next prev parent reply other threads:[~2021-06-11 11:44 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 11:43 [pve-devel] [PATCH-SERIES v6] APT repositories API/UI Fabian Ebner
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 01/11] initial commit Fabian Ebner
2021-06-18 8:14 ` Fabian Grünbichler
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 02/11] add files for Debian packaging Fabian Ebner
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 03/11] add functions to check for Proxmox repositories Fabian Ebner
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 04/11] add check_repositories function Fabian Ebner
2021-06-17 8:39 ` Wolfgang Bumiller
2021-06-18 6:42 ` Fabian Ebner
2021-06-17 14:16 ` Fabian Grünbichler
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 05/11] add common_digest helper Fabian Ebner
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 06/11] add release_upgrade function and constants for the current and upgrade suite Fabian Ebner
2021-06-17 14:16 ` [pve-devel] [pbs-devel] " Fabian Grünbichler
2021-06-18 6:50 ` Fabian Ebner
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 07/11] bump version to 0.1.1-1 Fabian Ebner
2021-06-11 11:43 ` Fabian Ebner [this message]
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 09/11] bump version to 1.0.0-1 Fabian Ebner
2021-06-11 11:43 ` [pve-devel] [PATCH v6 proxmox-apt 10/11] allow upgrade to bullseye Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-apt 11/11] bump version to 0.2.0-1 Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-widget-toolkit 1/3] add UI for APT repositories Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-widget-toolkit 2/3] APT repositories: add warnings Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-widget-toolkit 3/3] add upgrade button Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-backup 1/6] depend on new proxmox-apt crate Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-backup 2/6] api: apt: add repositories call Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-backup 3/6] ui: add APT repositories Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-backup 4/6] api: apt: add check_repositories_call Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 proxmox-backup 5/6] add upgrade_repositories call Fabian Ebner
2021-06-18 8:21 ` Fabian Grünbichler
2021-06-11 11:44 ` [pve-devel] [RFC v6 proxmox-backup 6/6] enable release upgrade for package repositories Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-rs 1/4] initial commit Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-rs 2/4] add files for Debian packaging Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-rs 3/4] apt: add upgrade_repositories call Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-rs 4/4] depend on proxmox-apt 0.2.0 Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-manager 1/5] api: apt: add call to list repositories Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-manager 2/5] ui: add panel for listing APT repositories Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-manager 3/5] api: apt: add call for repository check Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-manager 4/5] api: apt: add upgrade repos call Fabian Ebner
2021-06-11 11:44 ` [pve-devel] [PATCH v6 pve-manager 5/5] ui: node config: enable release upgrade button for package repositories Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210611114418.28772-9-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox