[policycoreutils] mgrepl [PATCH] Deleteall user customization fails if there is a user used
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Mar 26 13:16:01 UTC 2014
commit 60924625b8e45d7ecb6593b543a173236ca921c6
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Mar 26 09:15:58 2014 -0400
mgrepl [PATCH] Deleteall user customization fails if there is a user used
- for the default login. We do not want to fail on it and continue to delete
- customizations for users which are not used for default login.
policycoreutils-rhat.patch | 9 ++++++---
policycoreutils.spec | 7 ++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index a9f6dad..155ac56 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -674990,10 +674990,10 @@ index f8d2243..0000000
- print "%-30s (%-5s,%5s) %s" % (k, on_off[selinux.security_get_boolean_active(k)], on_off[ddict[k][2]], self.get_desc(k))
diff --git a/policycoreutils/semanage/seobject/__init__.py b/policycoreutils/semanage/seobject/__init__.py
new file mode 100644
-index 0000000..08bf736
+index 0000000..653750f
--- /dev/null
+++ b/policycoreutils/semanage/seobject/__init__.py
-@@ -0,0 +1,2237 @@
+@@ -0,0 +1,2240 @@
+#! /usr/bin/python -Es
+# Copyright (C) 2005-2013 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -675931,7 +675931,10 @@ index 0000000..08bf736
+ try:
+ self.begin()
+ for u in ulist:
-+ self.__delete(semanage_user_get_name(u))
++ try:
++ self.__delete(semanage_user_get_name(u))
++ except OSError:
++ continue
+ self.commit()
+ except ValueError as error:
+ self.mylog.commit(0)
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 0b642e4..899539f 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.2.5
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2
Group: System Environment/Base
# Based on git repository with tag 20101221
@@ -383,6 +383,11 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service
%changelog
+* Wed Mar 9 2014 Dan Walsh <dwalsh at redhat.com> - 2.2.5-9
+- mgrepl [PATCH] Deleteall user customization fails if there is a user used
+- for the default login. We do not want to fail on it and continue to delete
+- customizations for users which are not used for default login.
+
* Mon Mar 24 2014 Dan Walsh <dwalsh at redhat.com> - 2.2.5-8
- Update Translations
- Make selinux-policy build working also on another architectures related to s
More information about the scm-commits
mailing list