diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-04-21 08:20:43 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-04-21 09:24:01 +0300 |
commit | afc842c9025e33f2e25716d80ecac07117766457 (patch) | |
tree | c0c563d80cb5d190e5afbd09704055db7ad4a1c1 /src/python.rs | |
parent | 50258196ee8832ca8d9f02e73babb431248ed025 (diff) | |
download | bumper-rs-afc842c9025e33f2e25716d80ecac07117766457.tar.gz |
refactor: make logging and messages more consistent
Also, report the Debian package version correctly, not just the
upstream part.
Diffstat (limited to 'src/python.rs')
-rw-r--r-- | src/python.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/python.rs b/src/python.rs index 2b851f8..4cc043e 100644 --- a/src/python.rs +++ b/src/python.rs @@ -9,30 +9,28 @@ pub struct Python { impl Python { pub fn new(dirname: &Path) -> Result<Self, BumperError> { - debug!("considering {} as a Python project", dirname.display()); let setup_py = dirname.join("setup.py"); + debug!("does {} exist? {}", setup_py.display(), setup_py.exists()); if setup_py.exists() { let files = find_version_py_files(dirname); if files.is_empty() { debug!("no version.py files in {}", dirname.display()); Err(BumperError::NoVersionPy(dirname.to_path_buf())) } else { - info!("Looks like a Python project: {}", dirname.display()); Ok(Self { version_pys: files }) } } else { - debug!("{} does not exist", setup_py.display()); Err(BumperError::UnknownProjectKind(dirname.to_path_buf())) } } - pub fn set_version(&mut self, version: &str) -> Result<(), BumperError> { + pub fn set_version(&mut self, version: &str) -> Result<String, BumperError> { for filename in self.version_pys.iter() { info!("writing Python version to {}", filename.display()); std::fs::write(filename, format!("__version__ = \"{}\"\n", version)) .map_err(|err| BumperError::PythonWrite(filename.to_path_buf(), err))?; } - Ok(()) + Ok(version.to_string()) } } |