rpms/ipa/F-10 freeipa-cherrypy.patch, NONE, 1.1 freeipa-webui-logging.patch, NONE, 1.1 ipa.spec, 1.19, 1.20
rcritten
rcritten at fedoraproject.org
Thu Jun 18 20:46:40 UTC 2009
- Previous message (by thread): rpms/389-console/devel 389-console.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/389-console/F-10 389-console.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rcritten
Update of /cvs/extras/rpms/ipa/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4423
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
- Remove conflict for python-cherrypy
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-10/ipa.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ipa.spec 15 Dec 2008 18:40:57 -0000 1.19
+++ ipa.spec 18 Jun 2009 20:46:09 -0000 1.20
@@ -6,7 +6,7 @@
Name: ipa
Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Identity, Policy and Audit system
Group: System Environment/Base
@@ -36,6 +36,8 @@ BuildRequires: policycoreutils >= %{POL
BuildRequires: TurboGears
Patch0: freeipa-delegation.patch
+Patch1: freeipa-cherrypy.patch
+Patch2: freeipa-webui-logging.patch
%description
IPA is an integrated solution to provide centrally managed Identity (machine,
@@ -196,6 +198,8 @@ administering radius authentication sett
%setup -n freeipa-%{version} -q
%patch0 -p1 -b .delegation
+%patch1 -p1 -b .cherrypy
+%patch2 -p1 -b .webui-logging
%build
export CFLAGS="$CFLAGS %{optflags}"
@@ -469,6 +473,12 @@ fi
%{_sbindir}/ipa-modradiusprofile
%changelog
+* Thu Jun 18 2009 Rob Crittenden <rcritten at redhat.com> - 1.2.1-2
+- Resolves BZ 505686, workaround if both python-cherrypy and
+ python-cherrypy2 are loaded.
+- Don't shutdown logging, just close all loggers in ipa_webgui
+- Remove conflict for python-cherrypy
+
* Mon Dec 15 2008 Simo Sorce <ssorce at redhat.com> - 1.2.1-1
- Fix breakage caused by python-kerberos update to 1.1
- Previous message (by thread): rpms/389-console/devel 389-console.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/389-console/F-10 389-console.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list