From e0695b637f1bed030c269657baf9b79e68dac7fa Mon Sep 17 00:00:00 2001 From: Brian Gonzalez Date: Sun, 29 Mar 2020 20:54:56 -0400 Subject: [PATCH] Fall back to default unknown COMMIT_ID and BUILD_REL_DATE if unable to find commit in repo --- gst-plugin-version-helper/src/lib.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gst-plugin-version-helper/src/lib.rs b/gst-plugin-version-helper/src/lib.rs index b179dbcb..5fa58c8a 100644 --- a/gst-plugin-version-helper/src/lib.rs +++ b/gst-plugin-version-helper/src/lib.rs @@ -93,18 +93,20 @@ pub fn get_info() { // Otherwise use a 'release.txt' file as fallback, or report the current // date and an unknown revision. if let Ok(repo) = repo { - let commit = find_last_commit(&repo).expect("Couldn't find last commit"); - commit_id = oid_to_short_sha(commit.id()); - let timestamp = commit.time().seconds(); - let dt = chrono::Utc.timestamp(timestamp, 0); - commit_date = dt.format("%Y-%m-%d").to_string() + if let Ok(commit) = find_last_commit(&repo) { + commit_id = oid_to_short_sha(commit.id()); + let timestamp = commit.time().seconds(); + let dt = chrono::Utc.timestamp(timestamp, 0); + commit_date = dt.format("%Y-%m-%d").to_string() + } } else if let Ok(release_file) = fs::File::open(release_file) { let mut cargo_toml = crate_dir; cargo_toml.push("Cargo.toml"); - let cargo_toml = fs::File::open(cargo_toml).expect("Can't open Cargo.toml"); - commit_date = read_release_date(cargo_toml, release_file); - commit_id = "RELEASE".into(); + if let Ok(cargo_toml) = fs::File::open(cargo_toml) { + commit_date = read_release_date(cargo_toml, release_file); + commit_id = "RELEASE".into(); + } } println!("cargo:rustc-env=COMMIT_ID={}", commit_id);