proxmox-mirrors/proxmox-offline-mirror
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-offline-mirror synced 2025-08-10 15:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump proxmox-apt to 0.11 and adapt to changes.

Browse Source 
The recent changes to proxmox-apt along with the introduction of the
proxmox_apt_apit_types crate led to the following changes.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2024-07-09 12:47:01 +02:00 committed by Fabian Grünbichler
parent bd85cf4b59
commit 305b9e1b2b
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -26,7 +26,8 @@ sequoia-openpgp = { version = "1.12" }
walkdir = "2.3.1" walkdir = "2.3.1"
xz2 = "0.1" xz2 = "0.1"
proxmox-apt = { version = "0.10.9" } proxmox-apt = "0.11"
proxmox-apt-api-types = "1.0"
proxmox-async = "0.4" proxmox-async = "0.4"
proxmox-http = { version = "0.9", features = [ "client-sync", "client-trait" ]} proxmox-http = { version = "0.9", features = [ "client-sync", "client-trait" ]}
proxmox-router = { version = "2", features = [ "cli" ], default_features = false } proxmox-router = { version = "2", features = [ "cli" ], default_features = false }

3
debian/control vendored
View File

@ -17,7 +17,8 @@ Build-Depends: bash-completion,
librust-lazy-static-1+default-dev (>= 1.4-~~), librust-lazy-static-1+default-dev (>= 1.4-~~),
librust-nix-0.26+default-dev (>= 0.26.1-~~), librust-nix-0.26+default-dev (>= 0.26.1-~~),
librust-openssl-0.10+default-dev, librust-openssl-0.10+default-dev,
librust-proxmox-apt-0.10+default-dev (>= 0.10.9~~), librust-proxmox-apt-api-types-dev,
librust-proxmox-apt-0.11+default-dev,
librust-proxmox-async-0.4+default-dev, librust-proxmox-async-0.4+default-dev,
librust-proxmox-http-0.9+client-sync-dev, librust-proxmox-http-0.9+client-sync-dev,
librust-proxmox-http-0.9+client-trait-dev, librust-proxmox-http-0.9+client-trait-dev,

5
src/lib.rs
View File

@ -16,7 +16,8 @@ use std::{
use anyhow::{format_err, Error}; use anyhow::{format_err, Error};
use medium::MirrorInfo; use medium::MirrorInfo;
use proxmox_apt::repositories::{APTRepository, APTRepositoryFile, APTRepositoryFileType}; use proxmox_apt::repositories::{APTRepositoryFileImpl, APTRepositoryImpl};
use proxmox_apt_api_types::{APTRepository, APTRepositoryFile, APTRepositoryFileType};
use types::Snapshot; use types::Snapshot;
/// Main configuration file containing definitions of mirrors, external media and subscription keys. /// Main configuration file containing definitions of mirrors, external media and subscription keys.
@ -140,7 +141,7 @@ pub fn generate_repo_file_line(
repo.uris = vec![format!("file://{}", snapshot_path)]; repo.uris = vec![format!("file://{}", snapshot_path)];
repo.options repo.options
.push(proxmox_apt::repositories::APTRepositoryOption { .push(proxmox_apt_api_types::APTRepositoryOption {
key: "check-valid-until".to_string(), key: "check-valid-until".to_string(),
values: vec!["false".to_string()], values: vec!["false".to_string()],
}); });

11
src/mirror.rs
View File

@ -20,13 +20,12 @@ use crate::{
types::{Diff, Snapshot, SNAPSHOT_REGEX}, types::{Diff, Snapshot, SNAPSHOT_REGEX},
FetchResult, Progress, FetchResult, Progress,
}; };
use proxmox_apt::{
deb822::{ use proxmox_apt::deb822::{
CheckSums, CompressionType, FileReference, FileReferenceType, PackagesFile, ReleaseFile, CheckSums, CompressionType, FileReference, FileReferenceType, PackagesFile, ReleaseFile,
SourcesFile, SourcesFile,
},
repositories::{APTRepository, APTRepositoryPackageType},
}; };
use proxmox_apt_api_types::{APTRepository, APTRepositoryPackageType};
use crate::helpers; use crate::helpers;