[Cluster-devel] conga ./Plone-2.5.5-CMFPlone.patch luci/site/l ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-10 20:38:17

Modified files:
	.              : Plone-2.5.5-CMFPlone.patch 
	luci/site/luci/var: Data.fs 

Log message:
	Fix plone weirdness on RHEL4

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.5-CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.4.1&r2=1.1.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.20.2.20&r2=1.20.2.21

--- conga/Plone-2.5.5-CMFPlone.patch	2008/03/25 17:12:18	1.1.4.1
+++ conga/Plone-2.5.5-CMFPlone.patch	2008/04/10 20:37:49	1.1.4.2
@@ -1,6 +1,6 @@
 diff -ur Plone-2.5.5.orig/CMFPlone/exportimport/configure.zcml Plone-2.5.5/CMFPlone/exportimport/configure.zcml
 --- Plone-2.5.5.orig/CMFPlone/exportimport/configure.zcml	2007-12-04 22:33:37.000000000 -0500
-+++ Plone-2.5.5/CMFPlone/exportimport/configure.zcml	2008-01-17 13:15:43.000000000 -0500
++++ Plone-2.5.5/CMFPlone/exportimport/configure.zcml	2008-04-10 15:41:13.000000000 -0400
 @@ -32,12 +32,6 @@
       />
  
@@ -36,7 +36,7 @@
       provides="Products.GenericSetup.interfaces.IFilesystemExporter"
 diff -ur Plone-2.5.5.orig/CMFPlone/MembershipTool.py Plone-2.5.5/CMFPlone/MembershipTool.py
 --- Plone-2.5.5.orig/CMFPlone/MembershipTool.py	2007-12-04 22:33:37.000000000 -0500
-+++ Plone-2.5.5/CMFPlone/MembershipTool.py	2008-01-17 13:15:43.000000000 -0500
++++ Plone-2.5.5/CMFPlone/MembershipTool.py	2008-04-10 15:41:13.000000000 -0400
 @@ -1,4 +1,3 @@
 -import PIL
  from cStringIO import StringIO
@@ -52,20 +52,27 @@
                  pass
 diff -ur Plone-2.5.5.orig/CMFPlone/setup/dependencies.py Plone-2.5.5/CMFPlone/setup/dependencies.py
 --- Plone-2.5.5.orig/CMFPlone/setup/dependencies.py	2007-12-04 22:33:37.000000000 -0500
-+++ Plone-2.5.5/CMFPlone/setup/dependencies.py	2008-01-17 13:16:49.000000000 -0500
-@@ -107,7 +107,8 @@
++++ Plone-2.5.5/CMFPlone/setup/dependencies.py	2008-04-10 15:42:24.000000000 -0400
+@@ -105,10 +105,12 @@
+     # TODO: we might want to check if the user has jpeg and zlib support, too
+     import PIL.Image
  except ImportError:
-     log(("PIL not found. Plone needs PIL 1.1.5 or newer. "
-          "Please download it from http://www.pythonware.com/products/pil/ or "
+-    log(("PIL not found. Plone needs PIL 1.1.5 or newer. "
+-         "Please download it from http://www.pythonware.com/products/pil/ or "
 -         "http://effbot.org/downloads/#Imaging"))
-+         "http://effbot.org/downloads/#Imaging"),
-+         severity=logging.INFO, optional=1)
-     raise ImportError, 'PIL is required'
+-    raise ImportError, 'PIL is required'
++    pass
++    #log(("PIL not found. Plone needs PIL 1.1.5 or newer. "
++    #     "Please download it from http://www.pythonware.com/products/pil/ or "
++    #     "http://effbot.org/downloads/#Imaging"),
++    #     severity=logging.INFO, optional=1)
++    #raise ImportError, 'PIL is required'
  
  try:
+     from elementtree import ElementTree
 diff -ur Plone-2.5.5.orig/CMFPlone/utils.py Plone-2.5.5/CMFPlone/utils.py
 --- Plone-2.5.5.orig/CMFPlone/utils.py	2007-12-04 22:33:38.000000000 -0500
-+++ Plone-2.5.5/CMFPlone/utils.py	2008-01-17 13:15:43.000000000 -0500
++++ Plone-2.5.5/CMFPlone/utils.py	2008-04-10 15:41:13.000000000 -0400
 @@ -3,8 +3,6 @@
  from os.path import join, abspath, split
  from cStringIO import StringIO
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/10/31 15:03:15	1.20.2.20 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/04/10 20:37:49	1.20.2.21 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed