From ab201d742949d7848bc2c003a1fc5144805694d2 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 22 Dec 2005 21:21:08 +0000 Subject: [PATCH] * Thu Dec 22 2005 Dan Walsh 1.29.2-6 - Turn off try catch block to debug anaconda failure --- policycoreutils-rhat.patch | 18 ++++++++++++------ policycoreutils.spec | 5 ++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 8ad4619..ac0d539 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -228,7 +228,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policyco chcon(1), selinux(8) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.2/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2005-12-07 07:28:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/genhomedircon 2005-12-20 17:41:53.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/genhomedircon 2005-12-22 15:52:20.000000000 -0500 @@ -26,64 +26,73 @@ # # @@ -548,12 +548,18 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon po warning("%s homedir %s or its parent directoy conflicts with a\ndefined context in %s,\n%s will not create a new context." % (u[0], u[5], self.getFileContextFile(), sys.argv[0])) else: homedirs.append(homedir) -@@ -336,4 +357,4 @@ - except ValueError, error: - errorExit("ValueError %s" % error) - except IndexError, error: +@@ -333,7 +354,7 @@ + + except getopt.error, error: + errorExit("Options Error %s " % error) +-except ValueError, error: +- errorExit("ValueError %s" % error) +-except IndexError, error: - errorExit("IndexError") -+ errorExit("IndexError %s" % error) ++#except ValueError, error: ++# errorExit("ValueError %s" % error) ++#except IndexError, error: ++# errorExit("IndexError %s" % error) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/selisteners policycoreutils-1.29.2/scripts/selisteners --- nsapolicycoreutils/scripts/selisteners 1969-12-31 19:00:00.000000000 -0500 +++ policycoreutils-1.29.2/scripts/selisteners 2005-12-20 09:54:52.000000000 -0500 diff --git a/policycoreutils.spec b/policycoreutils.spec index b2833d8..d9348c9 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.2 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -96,6 +96,9 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Thu Dec 22 2005 Dan Walsh 1.29.2-6 +- Turn off try catch block to debug anaconda failure + * Tue Dec 20 2005 Dan Walsh 1.29.2-5 - More fixes for chcat