124efc9dd9
aptly: fix build failure dpkg: fix $TERMUX_ARCH in configure script gotty: switch to up-to-date upstream minicom: update source url ncurses: force build with -fPIC newsboat: update to 2.23 ovmf: update to 20210421.18.g15ee7b7689 pforth: update to 20210315 pup: build with GO111MODULE=off rcshell: update source url remind: update to 03.03.07 tweego: update to 2.1.1 virustotal-cli: update to 0.9.6 docker image: install some missing build tools
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
--- ./rust/libnewsboat/src/fslock.rs.orig 2021-05-17 16:33:46.781835254 +0000
|
|
+++ ./rust/libnewsboat/src/fslock.rs 2021-05-17 16:34:30.623855213 +0000
|
|
@@ -1,5 +1,4 @@
|
|
use crate::logger::{self, Level};
|
|
-use gettextrs::gettext;
|
|
use std::fs::{self, File, OpenOptions};
|
|
use std::io::{Error, Read, Write};
|
|
use std::os::unix::fs::OpenOptionsExt;
|
|
@@ -54,10 +53,10 @@
|
|
Ok(file) => file,
|
|
Err(reason) => {
|
|
return Err(fmt!(
|
|
- &gettext("Failed to open lock file '%s': %s"),
|
|
+ "Failed to open lock file '%s': %s",
|
|
new_lock_path
|
|
.to_str()
|
|
- .unwrap_or(&gettext("<filename containing invalid UTF-8 codepoint>")),
|
|
+ .unwrap_or("<filename containing invalid UTF-8 codepoint>"),
|
|
reason.to_string()
|
|
))
|
|
}
|
|
@@ -77,10 +76,10 @@
|
|
{
|
|
log!(Level::Debug, "FsLock: Failed to write PID");
|
|
return Err(fmt!(
|
|
- &gettext("Failed to write PID to lock file '%s': %s"),
|
|
+ "Failed to write PID to lock file '%s': %s",
|
|
new_lock_path
|
|
.to_str()
|
|
- .unwrap_or(&gettext("<filename containing invalid UTF-8 codepoint>")),
|
|
+ .unwrap_or("<filename containing invalid UTF-8 codepoint>"),
|
|
reason.to_string()
|
|
));
|
|
}
|
|
@@ -109,10 +108,10 @@
|
|
pid
|
|
);
|
|
Err(fmt!(
|
|
- &gettext("Failed to lock '%s', already locked by process with PID %{}"),
|
|
+ "Failed to lock '%s', already locked by process with PID %{}",
|
|
new_lock_path
|
|
.to_str()
|
|
- .unwrap_or(&gettext("<filename containing invalid UTF-8 codepoint>")),
|
|
+ .unwrap_or("<filename containing invalid UTF-8 codepoint>"),
|
|
PRIi64,
|
|
*pid as i64
|
|
))
|