mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-19 07:49:00 -04:00
x11-misc/i3status-rust: remove unexpected Result<T,E> handling in patch
Closes: https://bugs.gentoo.org/935882 Fixes: 13c4e705268820984b5f4a8a326df8fc7b583f2a Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
This commit is contained in:
parent
c42c888793
commit
056e2f988c
@ -4,7 +4,7 @@ placeholder values within the ebuild.
|
||||
Author: Lucio Sauer <watermanpaint@posteo.net>
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -1,16 +1,6 @@
|
||||
@@ -1,25 +1,11 @@
|
||||
-use std::process::Command;
|
||||
-
|
||||
fn main() {
|
||||
@ -18,8 +18,24 @@ Author: Lucio Sauer <watermanpaint@posteo.net>
|
||||
- .env("GIT_CONFIG_GLOBAL", "/dev/null")
|
||||
- .output()
|
||||
- .map(|o| String::from_utf8(o.stdout).unwrap());
|
||||
- if let (Ok(hash), Ok(date)) = (hash, date) {
|
||||
- let ver = format!(
|
||||
- "{} (commit {} {})",
|
||||
- env!("CARGO_PKG_VERSION"),
|
||||
- hash.trim(),
|
||||
- date.trim_matches('\'')
|
||||
- );
|
||||
- println!("cargo:rustc-env=VERSION={ver}");
|
||||
- } else {
|
||||
- println!("cargo:rustc-env=VERSION={}", env!("CARGO_PKG_VERSION"));
|
||||
- }
|
||||
+ let hash = String::from("%COMMIT%");
|
||||
+ let date = String::from("%DATE%");
|
||||
if let (Ok(hash), Ok(date)) = (hash, date) {
|
||||
let ver = format!(
|
||||
"{} (commit {} {})",
|
||||
+ let ver = format!(
|
||||
+ "{} (commit {} {})",
|
||||
+ env!("CARGO_PKG_VERSION"),
|
||||
+ hash.trim(),
|
||||
+ date.trim_matches('\'')
|
||||
+ );
|
||||
+ println!("cargo:rustc-env=VERSION={ver}");
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user