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

fix #5513: apt: do not assume that sources.list file exists

Browse Source 
Some users might want to switch to using only the newer .sources files
already, which Debian is going to switch to in the long run.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-06-05 10:29:24 +02:00 committed by Fabian Grünbichler
parent 04505ada7a
commit 2c2497e5be
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
proxmox-apt/src/repositories/mod.rs
View File

@ -146,12 +146,21 @@ pub fn repositories() -> Result<Repositories, Error> {
let sources_list_d_path = PathBuf::from(APT_SOURCES_LIST_DIRECTORY);
match APTRepositoryFile::new(sources_list_path) {
Ok(Some(mut file)) => match file.parse() {
Ok(()) => files.push(file),
Err(err) => errors.push(err),
},
_ => bail!("internal error with '{}'", APT_SOURCES_LIST_FILENAME),
if sources_list_path.exists() {
if sources_list_path.is_file() {
match APTRepositoryFile::new(sources_list_path) {
Ok(Some(mut file)) => match file.parse() {
Ok(()) => files.push(file),
Err(err) => errors.push(err),
},
_ => bail!("internal error with '{}'", APT_SOURCES_LIST_FILENAME),
}
} else {
errors.push(APTRepositoryFileError {
path: APT_SOURCES_LIST_FILENAME.to_string(),
error: "not a regular file!".to_string(),
});
}
}
if !sources_list_d_path.exists() {