proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-17 22:22:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

repo: make suite_variant helper more general

Browse Source 
use the first appearance of '-' or '/' to detect the variant instead
of keeping a list of possible variants, which would need to include
things like "-proposed-updates-debug".

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-07-29 14:25:49 +02:00 committed by Thomas Lamprecht
parent f48c12b00a
commit c7f6163e2b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/repositories/repository.rs
View File

@ -433,16 +433,12 @@ fn host_from_uri(uri: &str) -> Option<&str> {
}
/// Splits the suite into its base part and variant.
/// Does not expect the base part to contain either `-` or `/`.
fn suite_variant(suite: &str) -> (&str, &str) {
let variants = ["-backports-sloppy", "-backports", "-updates", "/updates"];
for variant in variants.iter() {
if let Some(base) = suite.strip_suffix(variant) {
return (base, variant);
}
match suite.find(&['-', '/'][..]) {
Some(n) => (&suite[0..n], &suite[n..]),
None => (suite, ""),
}
(suite, "")
}
/// Strips existing double quotes from the string first, and then adds double quotes at