diff --git a/.gitignore b/.gitignore index dd8aeea..9acfcb5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /fedora-update-feedback-2.1.1.crate /fedora-update-feedback-2.1.2.crate /fedora-update-feedback-2.1.3.crate +/fedora-update-feedback-2.1.4.crate diff --git a/error-early.patch b/error-early.patch new file mode 100644 index 0000000..0077df3 --- /dev/null +++ b/error-early.patch @@ -0,0 +1,25 @@ +diff --git a/src/main.rs b/src/main.rs +index e0240af..28dfd00 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -86,7 +86,20 @@ fn packages_in_update(update: &Update) -> Vec { + } + + #[tokio::main] ++#[allow(unreachable_code)] + async fn main() -> Result<(), String> { ++ ++ let err = "fedora-update-feedback does not currently work. \ ++The OpenID endpoint that was previously used for authenticating with bodhi is broken since bodhi-server v8.0.0. \ ++Please use fedora-easy-karma instead. I apologize for the inconvenience."; ++ ++ let width: usize = terminal_size::terminal_size().map_or(80, |(terminal_size::Width(w), _)| w as usize); ++ let msg = textwrap::fill(err, width); ++ ++ eprintln!("{}", msg); ++ ++ return Ok(()); ++ + // set up logger for warnings / debug messages + // turn off very verbose rustyline debug logging + #[cfg(not(feature = "debug"))] diff --git a/rust-fedora-update-feedback.spec b/rust-fedora-update-feedback.spec index 5203b5e..fa50111 100644 --- a/rust-fedora-update-feedback.spec +++ b/rust-fedora-update-feedback.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global crate fedora-update-feedback @@ -7,7 +7,7 @@ %global rustflags_debuginfo 1 Name: rust-fedora-update-feedback -Version: 2.1.3 +Version: 2.1.4 Release: %autorelease Summary: Provide feedback for Fedora updates (inspired by fedora-easy-karma) @@ -15,6 +15,9 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/fedora-update-feedback Source: %{crates_source} +# include patch that prints an explaination of why this program no longer works +Patch: error-early.patch + BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: @@ -29,6 +32,7 @@ Summary: %{summary} # Apache-2.0 # Apache-2.0 AND MIT # Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR ISC OR MIT # Apache-2.0 OR MIT # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT # BSD-3-Clause @@ -38,7 +42,7 @@ Summary: %{summary} # MPL-2.0 # Unlicense OR MIT # Zlib OR Apache-2.0 OR MIT -License: Apache-2.0 AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) +License: Apache-2.0 AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown # nano is the fallback in case no editor is configured diff --git a/sources b/sources index 46c4a3a..9df98ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fedora-update-feedback-2.1.3.crate) = 7a94f7353f30ee9ba41bf6232f427d7ccf66a1aa5ae4af6495963e6c0a271c6f7ba7717f07dabe711458552d1d9ccf326dd566b61348d8b01164e4a15841dd6c +SHA512 (fedora-update-feedback-2.1.4.crate) = 16a6bfb4d227562fe3584a2fd2ad72aae18ed6fbf16099c20d717d9eb0f052f30f0d97895eb122be41ff8cac4c3788563c18a4800009b1af7453ccbbea929149