* [PATCH] python/chcat: Don't fail on missing translation files
@ 2022-09-12 7:40 Johannes Segitz
2022-09-12 12:51 ` Daniel Burgener
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Segitz @ 2022-09-12 7:40 UTC (permalink / raw)
To: selinux
Exception handling was not in line with other files, causing chcat to
fail if translation files were not available
Signed-off-by: Johannes Segitz <jsegitz@suse.de>
---
python/chcat/chcat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/chcat/chcat b/python/chcat/chcat
index e779fcc6..1b93e99b 100755
--- a/python/chcat/chcat
+++ b/python/chcat/chcat
@@ -40,7 +40,7 @@ try:
localedir="/usr/share/locale",
**kwargs)
_ = t.gettext
-except ImportError:
+except:
try:
import builtins
builtins.__dict__['_'] = str
--
2.35.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] python/chcat: Don't fail on missing translation files
2022-09-12 7:40 [PATCH] python/chcat: Don't fail on missing translation files Johannes Segitz
@ 2022-09-12 12:51 ` Daniel Burgener
2022-09-12 13:06 ` Johannes Segitz
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Burgener @ 2022-09-12 12:51 UTC (permalink / raw)
To: Johannes Segitz, selinux
On 9/12/2022 3:40 AM, Johannes Segitz wrote:
> Exception handling was not in line with other files, causing chcat to
> fail if translation files were not available
>
> Signed-off-by: Johannes Segitz <jsegitz@suse.de>
> ---
> python/chcat/chcat | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/python/chcat/chcat b/python/chcat/chcat
> index e779fcc6..1b93e99b 100755
> --- a/python/chcat/chcat
> +++ b/python/chcat/chcat
> @@ -40,7 +40,7 @@ try:
> localedir="/usr/share/locale",
> **kwargs)
> _ = t.gettext
> -except ImportError:
> +except:
> try:
> import builtins
> builtins.__dict__['_'] = str
> --
> 2.35.3
I believe this was already fixed by
https://lore.kernel.org/selinux/87tu83r2zk.fsf@redhat.com/T/#m55d405c1504f7bc4ffff5f5ea9152b45fdf6848d
(commit 344463076b2a91e1d2c7f5cc3835dc1a53a05e88)?
-Daniel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] python/chcat: Don't fail on missing translation files
2022-09-12 12:51 ` Daniel Burgener
@ 2022-09-12 13:06 ` Johannes Segitz
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Segitz @ 2022-09-12 13:06 UTC (permalink / raw)
To: Daniel Burgener; +Cc: selinux
[-- Attachment #1: Type: text/plain, Size: 752 bytes --]
On Mon, Sep 12, 2022 at 08:51:32AM -0400, Daniel Burgener wrote:
> I believe this was already fixed by https://lore.kernel.org/selinux/87tu83r2zk.fsf@redhat.com/T/#m55d405c1504f7bc4ffff5f5ea9152b45fdf6848d
> (commit 344463076b2a91e1d2c7f5cc3835dc1a53a05e88)?
yes, looks like it. I sent this as a PR a few months ago and only came
around to sent it correctly now. Please diregrad the patch then
Johannes
--
GPG Key EE16 6BCE AD56 E034 BFB3 3ADD 7BF7 29D5 E7C8 1FA0
Subkey fingerprint: 250F 43F5 F7CE 6F1E 9C59 4F95 BC27 DD9D 2CC4 FD66
SUSE Software Solutions Germany GmbH, Frankenstraße 146, 90461 Nürnberg, Germany
Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
(HRB 36809, AG Nürnberg)
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-12 13:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 7:40 [PATCH] python/chcat: Don't fail on missing translation files Johannes Segitz
2022-09-12 12:51 ` Daniel Burgener
2022-09-12 13:06 ` Johannes Segitz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.