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

apt: fix removal of non-existant http-proxy config

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-25 11:54:46 +02:00
parent 338c545f85
commit e9c2638f90
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,14 +60,14 @@ pub fn update_apt_proxy_config(proxy_config: Option<&ProxyConfig>) -> Result<(),
if let Some(proxy_config) = proxy_config { if let Some(proxy_config) = proxy_config {
let proxy = proxy_config.to_proxy_string()?; let proxy = proxy_config.to_proxy_string()?;
let data = format!("Acquire::http::Proxy \"{}\";\n", proxy); let data = format!("Acquire::http::Proxy \"{}\";\n", proxy);
replace_file(PROXY_CFG_FN, data.as_bytes(), CreateOptions::new())?; replace_file(PROXY_CFG_FN, data.as_bytes(), CreateOptions::new())
} else { } else {
std::fs::remove_file(PROXY_CFG_FN).map_err(|err| { match std::fs::remove_file(PROXY_CFG_FN) {
format_err!("failed to remove proxy config '{}' - {}", PROXY_CFG_FN, err) Ok(()) => Ok(()),
})?; Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(()),
Err(err) => bail!("failed to remove proxy config '{}' - {}", PROXY_CFG_FN, err),
}
} }
Ok(())
} }
fn read_and_update_proxy_config() -> Result<Option<ProxyConfig>, Error> { fn read_and_update_proxy_config() -> Result<Option<ProxyConfig>, Error> {