admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if the snapd socket exists before trying to run it (fixes #56)

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-08-26 13:47:36 +03:00
parent 6c00fae63c
commit 98ec9ca011
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/linux.rs
View File

@@ -201,6 +201,7 @@ pub fn run_flatpak(terminal: &mut Terminal) -> Option<(&'static str, bool)> {
pub fn run_snap(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Option<(&'static str, bool)> { pub fn run_snap(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Option<(&'static str, bool)> {
if let Some(sudo) = sudo { if let Some(sudo) = sudo {
if let Some(snap) = which("snap") { if let Some(snap) = which("snap") {
if PathBuf::from("/var/snapd.socket").exists() {
terminal.print_separator("snap"); terminal.print_separator("snap");
let success = || -> Result<(), failure::Error> { let success = || -> Result<(), failure::Error> {
@@ -216,6 +217,7 @@ pub fn run_snap(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Option<(&'st
return Some(("snap", success)); return Some(("snap", success));
} }
} }
}
None None
} }