vmario/fabaccess-bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2024-11-22 14:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail if the dump directories already exist

Browse Source 
e.g. because of a previous dump
This commit is contained in:
Gregor Reitzenstein 2020-09-11 10:34:18 +02:00
parent d4ed885dc7
commit eb4e164c79
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/access.rs
View File

@ -128,7 +128,11 @@ impl PermissionsProvider {
pub fn dump_db<T: Transaction>(&mut self, txn: &T, mut path: PathBuf) -> Result<()> { pub fn dump_db<T: Transaction>(&mut self, txn: &T, mut path: PathBuf) -> Result<()> {
path.push("roles"); path.push("roles");
if let Err(e) = fs::create_dir(&path) { let mut k = Ok(());
if !path.is_dir() {
k = fs::create_dir(&path);
}
if let Err(e) = k {
error!(self.log, "Failed to create 'roles' directory: {}, skipping!", e); error!(self.log, "Failed to create 'roles' directory: {}, skipping!", e);
return Ok(()) return Ok(())
} else { } else {
@ -140,8 +144,16 @@ impl PermissionsProvider {
} }
path.pop(); path.pop();
// ====================: PERMS :====================
path.push("perms"); path.push("perms");
if let Err(e) = fs::create_dir(&path) { let mut k = Ok(());
if !path.is_dir() {
k = fs::create_dir(&path);
}
if let Err(e) = k {
error!(self.log, "Failed to create 'perms' directory: {}, skipping!", e); error!(self.log, "Failed to create 'perms' directory: {}, skipping!", e);
return Ok(()) return Ok(())
} else { } else {
@ -153,8 +165,16 @@ impl PermissionsProvider {
} }
path.pop(); path.pop();
// ====================: USERS :====================
path.push("users"); path.push("users");
if let Err(e) = fs::create_dir(&path) { let mut k = Ok(());
if !path.is_dir() {
k = fs::create_dir(&path);
}
if let Err(e) = k {
error!(self.log, "Failed to create 'users' directory: {}, skipping!", e); error!(self.log, "Failed to create 'users' directory: {}, skipping!", e);
return Ok(()) return Ok(())
} else { } else {