rpms/ipa/F-11 freeipa-cherrypy.patch, NONE, 1.1 freeipa-webui-logging.patch, NONE, 1.1 ipa.spec, 1.22, 1.23
rcritten
rcritten at fedoraproject.org
Thu Jun 18 20:25:32 UTC 2009
Author: rcritten
Update of /cvs/extras/rpms/ipa/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29327
Modified Files:
ipa.spec
Added Files:
freeipa-cherrypy.patch freeipa-webui-logging.patch
Log Message:
- Resolves BZ 505686, workaround if both python-cherrypy and
python-cherrypy2 are loaded.
- Don't shutdown logging, just close all loggers in ipa_webgui
freeipa-cherrypy.patch:
--- NEW FILE freeipa-cherrypy.patch ---
--- a/ipa-server/ipa-gui/ipa_webgui
+++ b/ipa-server/ipa-gui/ipa_webgui
@@ -17,6 +17,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+__requires__ = 'TurboGears'
+
import os, sys, pwd, grp
from optparse import OptionParser
import traceback
freeipa-webui-logging.patch:
--- NEW FILE freeipa-webui-logging.patch ---
--- a/ipa-server/ipa-gui/ipa_webgui
+++ b/ipa-server/ipa-gui/ipa_webgui
@@ -175,7 +177,10 @@ def main():
# Shut down the logging set up here so that CherryPy logging can take
# over. TurboGears configuration errors will not be caught.
if not foreground:
- logging.shutdown()
+ l = logging.getLogger()
+ for h in logging.root.handlers:
+ l.removeHandler(h)
+
# Load the config - look for a local file first for development
# and then the system config file
Index: ipa.spec
===================================================================
RCS file: /cvs/extras/rpms/ipa/F-11/ipa.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ipa.spec 25 Feb 2009 07:39:20 -0000 1.22
+++ ipa.spec 18 Jun 2009 20:25:02 -0000 1.23
@@ -6,7 +6,7 @@
Name: ipa
Version: 1.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Identity, Policy and Audit system
Group: System Environment/Base
@@ -37,6 +37,8 @@ BuildRequires: TurboGears
Patch0: freeipa-delegation.patch
Patch1: freeipa-selinux.patch
+Patch2: freeipa-cherrypy.patch
+Patch3: freeipa-webui-logging.patch
%description
IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -198,6 +200,8 @@ administering radius authentication sett
%patch0 -p1 -b .delegation
%patch1 -p1 -b .selinux
+%patch2 -p1 -b .cherrypy
+%patch3 -p1 -b .webui-logging
%build
export CFLAGS="$CFLAGS %{optflags}"
@@ -471,6 +475,11 @@ fi
%{_sbindir}/ipa-modradiusprofile
%changelog
+* Thu Jun 18 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.1-5
+- Resolves BZ 505686, workaround if both python-cherrypy and
+ python-cherrypy2 are loaded.
+- Don't shutdown logging, just close all loggers in ipa_webgui
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list