tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api: apt: adapt to further proxmox-apt back-end changes 

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

10
src/api2/node/apt.rs
View File

@ -447,9 +447,8 @@ pub fn get_repositories() -> Result<Value, Error> {
let suite = proxmox_apt::repositories::get_current_release_codename()?;
let infos = proxmox_apt::repositories::check_repositories(&files)?;
let standard_repos =
proxmox_apt::repositories::standard_repositories(&files, "pbs", &suite);
let infos = proxmox_apt::repositories::check_repositories(&files, suite);
let standard_repos = proxmox_apt::repositories::standard_repositories(&files, "pbs", suite);
Ok(json!({
"files": files,
@ -497,7 +496,7 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option<String>) -> Re
// check if it's already configured first
for file in files.iter_mut() {
for repo in file.repositories.iter_mut() {
if repo.is_referenced_repository(handle, "pbs", &suite) {
if repo.is_referenced_repository(handle, "pbs", &suite.to_string()) {
if repo.enabled {
return Ok(());
}
@ -510,8 +509,7 @@ pub fn add_repository(handle: APTRepositoryHandle, digest: Option<String>) -> Re
}
}
let (repo, path) =
proxmox_apt::repositories::get_standard_repository(handle, "pbs", &suite);
let (repo, path) = proxmox_apt::repositories::get_standard_repository(handle, "pbs", suite);
if let Some(error) = errors.iter().find(|error| error.path == path) {
bail!(