Browse Source

Revert "read version from manifest first"

This reverts commit 2deedec26d.
pull/1649/head
o2sh 2 weeks ago
parent
commit
f013d5f567
No known key found for this signature in database
GPG Key ID: D099D76E63AD9E67
  1. 16
      src/info/version.rs

16
src/info/version.rs

@ -17,12 +17,6 @@ impl VersionInfo {
} }
fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String> { fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String> {
if let Some(m) = manifest {
if !m.version.is_empty() {
return Ok(m.version.clone());
}
}
let mut version = String::new(); let mut version = String::new();
let mut most_recent = 0; let mut most_recent = 0;
@ -36,7 +30,15 @@ fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String>
} }
} }
Ok(version) if version.is_empty() {
let version_from_manifest = match manifest {
Some(m) => m.version.clone(),
None => String::new(),
};
Ok(version_from_manifest)
} else {
Ok(version)
}
} }
#[typetag::serialize] #[typetag::serialize]

Loading…
Cancel
Save