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

apt: improve error messages

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-10-22 17:13:26 +02:00
parent 9e61c01ce4
commit 6eb41487ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ fn get_changelog_url(
let output = match output.splitn(2, ' ').next() { let output = match output.splitn(2, ' ').next() {
Some(output) => { Some(output) => {
if output.len() < 2 { if output.len() < 2 {
bail!("invalid output (URI part too short) from 'apt-get changelog --print-uris: {}", output) bail!("invalid output (URI part too short) from 'apt-get changelog --print-uris': {}", output)
} }
output[1..output.len()-1].to_owned() output[1..output.len()-1].to_owned()
}, },
@ -421,7 +421,7 @@ fn apt_get_changelog(
// FIXME: use 'apt-get changelog' for proxmox packages as well, once repo supports it // FIXME: use 'apt-get changelog' for proxmox packages as well, once repo supports it
if changelog_url.starts_with("http://download.proxmox.com/") { if changelog_url.starts_with("http://download.proxmox.com/") {
let changelog = crate::tools::runtime::block_on(http::get_string(changelog_url)) let changelog = crate::tools::runtime::block_on(http::get_string(changelog_url))
.map_err(|err| format_err!("Error downloading changelog: {}", err))?; .map_err(|err| format_err!("Error downloading changelog from '{}': {}", changelog_url, err))?;
return Ok(json!(changelog)); return Ok(json!(changelog));
} else { } else {
let mut command = std::process::Command::new("apt-get"); let mut command = std::process::Command::new("apt-get");