grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add message to IO errors (#10324)

Browse Source
This commit is contained in:
Psilon 2019-02-18 20:39:38 +03:00 committed by Andronik Ordian
parent aea289e79e
commit ca67dc251f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parity/upgrade.rs
View File

@ -28,9 +28,9 @@ use journaldb::Algorithm;
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
CannotCreateConfigPath, CannotCreateConfigPath(io::Error),
CannotWriteVersionFile, CannotWriteVersionFile(io::Error),
CannotUpdateVersionFile, CannotUpdateVersionFile(io::Error),
SemVer(SemVerError), SemVer(SemVerError),
} }
@ -105,7 +105,7 @@ fn with_locked_version<F>(db_path: &str, script: F) -> Result<usize, Error>
where F: Fn(&Version) -> Result<usize, Error> where F: Fn(&Version) -> Result<usize, Error>
{ {
let mut path = PathBuf::from(db_path); let mut path = PathBuf::from(db_path);
create_dir_all(&path).map_err(|_| Error::CannotCreateConfigPath)?; create_dir_all(&path).map_err(Error::CannotCreateConfigPath)?;
path.push("ver.lock"); path.push("ver.lock");
let version = let version =
@ -118,11 +118,11 @@ fn with_locked_version<F>(db_path: &str, script: F) -> Result<usize, Error>
}) })
.unwrap_or(Version::new(0, 9, 0)); .unwrap_or(Version::new(0, 9, 0));
let mut lock = File::create(&path).map_err(|_| Error::CannotWriteVersionFile)?; let mut lock = File::create(&path).map_err(Error::CannotWriteVersionFile)?;
let result = script(&version); let result = script(&version);
let written_version = Version::parse(CURRENT_VERSION)?; let written_version = Version::parse(CURRENT_VERSION)?;
lock.write_all(written_version.to_string().as_bytes()).map_err(|_| Error::CannotUpdateVersionFile)?; lock.write_all(written_version.to_string().as_bytes()).map_err(Error::CannotUpdateVersionFile)?;
result result
} }