rpms/sabayon/F-11 sabayon.spec,1.60,1.61 selinux.patch,1.2,1.3

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32696

Modified Files:
	sabayon.spec selinux.patch 
Log Message:
* Fri Oct 23 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-4
- Move errors.py to sabayon-apply package
- Only trap Exception on sabayon-apply error



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-11/sabayon.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sabayon.spec	20 Apr 2009 11:44:30 -0000	1.60
+++ sabayon.spec	23 Oct 2009 12:31:53 -0000	1.61
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.25.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -223,6 +223,9 @@ fi
 %{python_sitearch}/%{name}/debuglog.py
 %{python_sitearch}/%{name}/debuglog.pyc
 %ghost %{python_sitearch}/%{name}/debuglog.pyo
+%{python_sitearch}/%{name}/errors.py
+%{python_sitearch}/%{name}/errors.pyc
+%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/sources
 %{python_sitearch}/%{name}/sources/*.py
@@ -288,9 +291,6 @@ fi
 %{python_sitearch}/%{name}/lockdownappliersabayon.py
 %{python_sitearch}/%{name}/lockdownappliersabayon.pyc
 %ghost %{python_sitearch}/%{name}/lockdownappliersabayon.pyo
-%{python_sitearch}/%{name}/errors.py
-%{python_sitearch}/%{name}/errors.pyc
-%ghost %{python_sitearch}/%{name}/errors.pyo
 
 %dir %{python_sitearch}/%{name}/lockdown
 %{python_sitearch}/%{name}/lockdown/*.py
@@ -298,6 +298,10 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Oct 23 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-4
+- Move errors.py to sabayon-apply package
+- Only trap Exception on sabayon-apply error
+
 * Mon Apr 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-3
 - Another, more complete fix for panel gconf save issues (gnome #542604)
 

selinux.patch:
 sabayon-2.22.0/admin-tool/profilesdialog.py |    6 ++++++
 sabayon-2.22.0/lib/userdb.py                |    6 ++++++
 sabayon-2.28.0/admin-tool/sabayon-apply     |    2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/F-11/selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- selinux.patch	12 Mar 2008 01:11:35 -0000	1.2
+++ selinux.patch	23 Oct 2009 12:31:54 -0000	1.3
@@ -44,3 +44,15 @@ diff -up sabayon-2.22.0/lib/userdb.py.se
          self.modified = 0
  
      def set_default_profile (self, profile):
+diff -up sabayon-2.28.0/admin-tool/sabayon-apply~ sabayon-2.28.0/admin-tool/sabayon-apply
+--- sabayon-2.28.0/admin-tool/sabayon-apply~	2009-09-21 16:12:03.000000000 -0400
++++ sabayon-2.28.0/admin-tool/sabayon-apply	2009-10-22 16:23:21.000000000 -0400
+@@ -115,7 +115,7 @@ if __name__ == '__main__':
+ 
+         if errors.errors_have_recoverable_error ():
+             mprint ("There were recoverable errors while applying the profile.")
+-    except:
++    except Exception:
+         errors.errors_exit_with_fatal_exception (debuglog.DEBUG_LOG_DOMAIN_SABAYON_APPLY,
+                                                  util.get_admin_log_config_filename ())
+