[rhel7/master] Fix SELINUX_DEFAULT import (#1137049)
Brian C. Lane
bcl at redhat.com
Wed Sep 17 20:00:39 UTC 2014
When anaconda is run with --help or --version it won't have constants.*
available, so just import what we need in parseArguments. Also change
the other use to use constants.SELINUX_DEFAULT since it has already been
imported at that point.
Resolves: rhbz#1137049
---
anaconda | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/anaconda b/anaconda
index 608176a..9b9a453 100755
--- a/anaconda
+++ b/anaconda
@@ -302,8 +302,9 @@ def parseArguments(argv=None, boot_cmdline=None):
ap.add_argument("--syslog", metavar="HOST[:PORT]", help=help_parser.help_text("syslog"))
from pykickstart.constants import SELINUX_DISABLED, SELINUX_ENFORCING
+ from pyanaconda.constants import SELINUX_DEFAULT
ap.add_argument("--noselinux", dest="selinux", action="store_const",
- const=SELINUX_DISABLED, default=constants.SELINUX_DEFAULT,
+ const=SELINUX_DISABLED, default=SELINUX_DEFAULT,
help=help_parser.help_text("noselinux"))
ap.add_argument("--selinux", action="store_const",
const=SELINUX_ENFORCING, help=help_parser.help_text("selinux"))
@@ -1019,8 +1020,7 @@ if __name__ == "__main__":
log.error("Unknown method: %s", (anaconda.methodstr,))
# Override the selinux state from kickstart if set on the command line
- from pyanaconda.constants import SELINUX_DEFAULT
- if flags.selinux != SELINUX_DEFAULT:
+ if flags.selinux != constants.SELINUX_DEFAULT:
ksdata.selinux.selinux = flags.selinux
from pyanaconda import localization
--
1.9.3
More information about the anaconda-patches
mailing list