proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-07-24 15:11:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check repos: have caller specify the current suite

Browse Source 
Like that, a potential error is further up the stack, and it's more
consistent with what the standard_repository functions do.

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

6
src/repositories/file.rs
View File

@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
use anyhow::{bail, format_err, Error};
use serde::{Deserialize, Serialize};
use crate::repositories::release::{get_current_release_codename, DEBIAN_SUITES};
use crate::repositories::release::DEBIAN_SUITES;
use crate::repositories::repository::{
APTRepository, APTRepositoryFileType, APTRepositoryPackageType,
};
@ -300,7 +300,7 @@ impl APTRepositoryFile {
/// Checks if old or unstable suites are configured and also that the
/// `stable` keyword is not used.
pub fn check_suites(&self) -> Result<Vec<APTRepositoryInfo>, Error> {
pub fn check_suites(&self, current_suite: &str) -> Result<Vec<APTRepositoryInfo>, Error> {
let mut infos = vec![];
for (n, repo) in self.repositories.iter().enumerate() {
@ -318,8 +318,6 @@ impl APTRepositoryFile {
})
};
let current_suite = get_current_release_codename()?;
let current_index = match DEBIAN_SUITES
.iter()
.position(|&suite| suite == current_suite)

7
src/repositories/mod.rs
View File

@ -49,11 +49,14 @@ fn common_digest(files: &[APTRepositoryFile]) -> [u8; 32] {
/// `warnings` for bad suites.
/// `ignore-pre-upgrade-warning` when the next stable suite is configured.
/// `badge` for official URIs.
pub fn check_repositories(files: &[APTRepositoryFile]) -> Result<Vec<APTRepositoryInfo>, Error> {
pub fn check_repositories(
files: &[APTRepositoryFile],
current_suite: &str,
) -> Result<Vec<APTRepositoryInfo>, Error> {
let mut infos = vec![];
for file in files.iter() {
infos.append(&mut file.check_suites()?);
infos.append(&mut file.check_suites(current_suite)?);
infos.append(&mut file.check_uris());
}

6
tests/repositories.rs
View File

@ -187,7 +187,7 @@ fn test_check_repositories() -> Result<(), Error> {
let mut file = APTRepositoryFile::new(&absolute_suite_list)?.unwrap();
file.parse()?;
let infos = check_repositories(&vec![file])?;
let infos = check_repositories(&vec![file], "bullseye")?;
assert_eq!(infos.is_empty(), true);
let pve_list = read_dir.join("pve.list");
@ -212,7 +212,7 @@ fn test_check_repositories() -> Result<(), Error> {
}
expected_infos.sort();
let mut infos = check_repositories(&vec![file])?;
let mut infos = check_repositories(&vec![file], "bullseye")?;
infos.sort();
assert_eq!(infos, expected_infos);
@ -278,7 +278,7 @@ fn test_check_repositories() -> Result<(), Error> {
}
expected_infos.sort();
let mut infos = check_repositories(&vec![file])?;
let mut infos = check_repositories(&vec![file], "bullseye")?;
infos.sort();
assert_eq!(infos, expected_infos);