s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve error handling.

Browse source
This commit is contained in:
R-VdP 2023-02-14 13:39:21 +01:00
parent cf7d0f76d3
commit e2e0e74a74
No known key found for this signature in database
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib.rs
View file

@ -57,8 +57,12 @@ fn create_store_link(store_path: &StorePath, from: &Path) -> Result<()> {
fn create_link(to: &Path, from: &Path) -> Result<()> { fn create_link(to: &Path, from: &Path) -> Result<()> {
log::info!("Creating symlink: {} -> {}", from.display(), to.display()); log::info!("Creating symlink: {} -> {}", from.display(), to.display());
if from.is_symlink() { if from.exists() {
fs::remove_file(from)?; if from.is_symlink() {
fs::remove_file(from)?;
} else {
anyhow::bail!("File exists and is no link!");
}
} }
unix::fs::symlink(to, from).map_err(anyhow::Error::from) unix::fs::symlink(to, from).map_err(anyhow::Error::from)
} }
@ -66,10 +70,10 @@ fn create_link(to: &Path, from: &Path) -> Result<()> {
fn remove_link(from: &Path) -> Result<()> { fn remove_link(from: &Path) -> Result<()> {
log::info!("Removing symlink: {}", from.display()); log::info!("Removing symlink: {}", from.display());
if from.is_symlink() { if from.is_symlink() {
fs::remove_file(from)?; fs::remove_file(from).map_err(anyhow::Error::from)
return Ok(()); } else {
anyhow::bail!("Not a symlink!");
} }
anyhow::bail!("Not a symlink!")
} }
pub fn compose<A, B, C, G, F>(f: F, g: G) -> impl Fn(A) -> C pub fn compose<A, B, C, G, F>(f: F, g: G) -> impl Fn(A) -> C