2019-10-16 09:36:01 +00:00
|
|
|
From 7e88d2395d39f7a15d812c8d3e4d176a832da7ae Mon Sep 17 00:00:00 2001
|
2019-03-22 16:35:38 +00:00
|
|
|
From: Petr Lautrbach <plautrba@redhat.com>
|
|
|
|
Date: Mon, 6 Aug 2018 13:37:07 +0200
|
|
|
|
Subject: [PATCH] Use correct gettext domains in python/ gui/ sandbox/
|
|
|
|
|
|
|
|
https://github.com/fedora-selinux/selinux/issues/43
|
|
|
|
---
|
|
|
|
gui/booleansPage.py | 2 +-
|
|
|
|
gui/domainsPage.py | 2 +-
|
|
|
|
gui/fcontextPage.py | 2 +-
|
|
|
|
gui/loginsPage.py | 2 +-
|
|
|
|
gui/modulesPage.py | 2 +-
|
|
|
|
gui/polgengui.py | 2 +-
|
|
|
|
gui/portsPage.py | 2 +-
|
|
|
|
gui/semanagePage.py | 2 +-
|
|
|
|
gui/statusPage.py | 2 +-
|
|
|
|
gui/system-config-selinux.py | 2 +-
|
|
|
|
gui/usersPage.py | 2 +-
|
|
|
|
python/chcat/chcat | 2 +-
|
|
|
|
python/semanage/semanage | 2 +-
|
|
|
|
python/semanage/seobject.py | 2 +-
|
|
|
|
python/sepolgen/src/sepolgen/sepolgeni18n.py | 2 +-
|
|
|
|
python/sepolicy/sepolicy.py | 2 +-
|
|
|
|
python/sepolicy/sepolicy/__init__.py | 2 +-
|
|
|
|
python/sepolicy/sepolicy/generate.py | 2 +-
|
|
|
|
python/sepolicy/sepolicy/gui.py | 2 +-
|
|
|
|
python/sepolicy/sepolicy/interface.py | 2 +-
|
|
|
|
sandbox/sandbox | 2 +-
|
|
|
|
21 files changed, 21 insertions(+), 21 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/gui/booleansPage.py b/gui/booleansPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 7849bea26a06..dd12b6d6ab86 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/booleansPage.py
|
|
|
|
+++ b/gui/booleansPage.py
|
|
|
|
@@ -38,7 +38,7 @@ DISABLED = 2
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/domainsPage.py b/gui/domainsPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index bad5140d8c59..6bbe4de5884f 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/domainsPage.py
|
|
|
|
+++ b/gui/domainsPage.py
|
|
|
|
@@ -30,7 +30,7 @@ from semanagePage import *
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 370bbee40786..e424366da26f 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/fcontextPage.py
|
|
|
|
+++ b/gui/fcontextPage.py
|
|
|
|
@@ -47,7 +47,7 @@ class context:
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/loginsPage.py b/gui/loginsPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index b67eb8bc42af..cbfb0cc23f65 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/loginsPage.py
|
|
|
|
+++ b/gui/loginsPage.py
|
|
|
|
@@ -29,7 +29,7 @@ from semanagePage import *
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/modulesPage.py b/gui/modulesPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 0584acf9b3a4..35a0129bab9c 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/modulesPage.py
|
|
|
|
+++ b/gui/modulesPage.py
|
|
|
|
@@ -30,7 +30,7 @@ from semanagePage import *
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/polgengui.py b/gui/polgengui.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index d284ded65279..01f541bafae8 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/polgengui.py
|
|
|
|
+++ b/gui/polgengui.py
|
|
|
|
@@ -63,7 +63,7 @@ def get_all_modules():
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/portsPage.py b/gui/portsPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 30f58383bc1d..a537ecc8c0a1 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/portsPage.py
|
|
|
|
+++ b/gui/portsPage.py
|
|
|
|
@@ -35,7 +35,7 @@ from semanagePage import *
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/semanagePage.py b/gui/semanagePage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 4127804fbbee..5361d69c1313 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/semanagePage.py
|
|
|
|
+++ b/gui/semanagePage.py
|
|
|
|
@@ -22,7 +22,7 @@ from gi.repository import Gdk, Gtk
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/statusPage.py b/gui/statusPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 766854b19cba..a8f079b9b163 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/statusPage.py
|
|
|
|
+++ b/gui/statusPage.py
|
|
|
|
@@ -35,7 +35,7 @@ RELABELFILE = "/.autorelabel"
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 3f70122b87e8..8c46c987b974 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/system-config-selinux.py
|
|
|
|
+++ b/gui/system-config-selinux.py
|
|
|
|
@@ -45,7 +45,7 @@ import selinux
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/gui/usersPage.py b/gui/usersPage.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 26794ed5c3f3..d15d4c5a71dd 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/gui/usersPage.py
|
|
|
|
+++ b/gui/usersPage.py
|
|
|
|
@@ -29,7 +29,7 @@ from semanagePage import *
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-gui"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/chcat/chcat b/python/chcat/chcat
|
2019-10-16 09:36:01 +00:00
|
|
|
index fdd2e46ee3f9..839ddd3b54b6 100755
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/chcat/chcat
|
|
|
|
+++ b/python/chcat/chcat
|
|
|
|
@@ -30,7 +30,7 @@ import getopt
|
|
|
|
import selinux
|
|
|
|
import seobject
|
|
|
|
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/semanage/semanage b/python/semanage/semanage
|
2019-10-16 09:36:01 +00:00
|
|
|
index b2fabea67a87..3cc30a160a74 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/semanage/semanage
|
|
|
|
+++ b/python/semanage/semanage
|
|
|
|
@@ -27,7 +27,7 @@ import traceback
|
|
|
|
import argparse
|
|
|
|
import seobject
|
|
|
|
import sys
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index dc413ca5864c..4340495caef2 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/semanage/seobject.py
|
|
|
|
+++ b/python/semanage/seobject.py
|
|
|
|
@@ -29,7 +29,7 @@ import sys
|
|
|
|
import stat
|
|
|
|
import socket
|
|
|
|
from semanage import *
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
import sepolicy
|
|
|
|
import setools
|
|
|
|
from IPy import IP
|
|
|
|
diff --git a/python/sepolgen/src/sepolgen/sepolgeni18n.py b/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 998c4356415c..56ebd807c69c 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
|
|
|
+++ b/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
- t = gettext.translation( 'yumex' )
|
|
|
|
+ t = gettext.translation( 'selinux-python' )
|
|
|
|
_ = t.gettext
|
|
|
|
except:
|
|
|
|
def _(str):
|
|
|
|
diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 7b2230651099..32956e58f52e 100755
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/sepolicy/sepolicy.py
|
|
|
|
+++ b/python/sepolicy/sepolicy.py
|
2019-10-16 09:36:01 +00:00
|
|
|
@@ -28,7 +28,7 @@ import sepolicy
|
|
|
|
from multiprocessing import Pool
|
2019-03-22 16:35:38 +00:00
|
|
|
from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text
|
|
|
|
import argparse
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index ea05d892bf3b..9a9c2ae9f237 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/sepolicy/sepolicy/__init__.py
|
|
|
|
+++ b/python/sepolicy/sepolicy/__init__.py
|
|
|
|
@@ -13,7 +13,7 @@ import os
|
|
|
|
import re
|
|
|
|
import gzip
|
|
|
|
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 973edb9d6b91..6202e30d69ac 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/sepolicy/sepolicy/generate.py
|
|
|
|
+++ b/python/sepolicy/sepolicy/generate.py
|
|
|
|
@@ -49,7 +49,7 @@ import sepolgen.defaults as defaults
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 1e86422b864a..c9ca158ddd09 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/sepolicy/sepolicy/gui.py
|
|
|
|
+++ b/python/sepolicy/sepolicy/gui.py
|
|
|
|
@@ -41,7 +41,7 @@ import os
|
|
|
|
import re
|
|
|
|
import unicodedata
|
|
|
|
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py
|
2019-10-16 09:36:01 +00:00
|
|
|
index 187419fa7822..5a5d919dcfaa 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/python/sepolicy/sepolicy/interface.py
|
|
|
|
+++ b/python/sepolicy/sepolicy/interface.py
|
|
|
|
@@ -30,7 +30,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us
|
|
|
|
##
|
|
|
|
## I18N
|
|
|
|
##
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-python"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
diff --git a/sandbox/sandbox b/sandbox/sandbox
|
2019-10-16 09:36:01 +00:00
|
|
|
index ca5f1e030a51..16c43b51eaaa 100644
|
2019-03-22 16:35:38 +00:00
|
|
|
--- a/sandbox/sandbox
|
|
|
|
+++ b/sandbox/sandbox
|
|
|
|
@@ -37,7 +37,7 @@ import sepolicy
|
|
|
|
|
|
|
|
SEUNSHARE = "/usr/sbin/seunshare"
|
|
|
|
SANDBOXSH = "/usr/share/sandbox/sandboxX.sh"
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
|
|
+PROGNAME = "selinux-sandbox"
|
|
|
|
try:
|
|
|
|
import gettext
|
|
|
|
kwargs = {}
|
|
|
|
--
|
2019-10-16 09:36:01 +00:00
|
|
|
2.23.0
|
2019-03-22 16:35:38 +00:00
|
|
|
|