konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

fallback to Release file for Origin retrieval

Browse Source 
APT will not store the InRelease file in some cases, and some repositories
might not even have one in the first place.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2023-04-12 09:17:57 +02:00 committed by Thomas Lamprecht
parent 35dc1b0b8d
commit 27cd025053
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxmox-apt/src/repositories/repository.rs
View File

@ -323,11 +323,14 @@ impl APTRepository {
pub fn get_cached_origin(&self) -> Result<Option<String>, Error> {
for uri in self.uris.iter() {
for suite in self.suites.iter() {
let file = in_release_filename(uri, suite);
let mut file = release_filename(uri, suite, false);
if !file.exists() {
file = release_filename(uri, suite, true);
if !file.exists() {
continue;
}
}
let raw = std::fs::read(&file)
.map_err(|err| format_err!("unable to read {:?} - {}", file, err))?;
@ -362,17 +365,19 @@ impl APTRepository {
}
}
/// Get the path to the cached InRelease file.
fn in_release_filename(uri: &str, suite: &str) -> PathBuf {
/// Get the path to the cached (In)Release file.
fn release_filename(uri: &str, suite: &str, detached: bool) -> PathBuf {
let mut path = PathBuf::from(&crate::config::get().dir_state);
path.push(&crate::config::get().dir_state_lists);
let filename = uri_to_filename(uri);
let encoded_uri = uri_to_filename(uri);
let filename = if detached { "Release" } else { "InRelease" };
path.push(format!(
"{}_dists_{}_InRelease",
filename,
"{}_dists_{}_{}",
encoded_uri,
suite.replace('/', "_"), // e.g. for buster/updates
filename,
));
path