Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
f1f4c429
Commit
f1f4c429
authored
Apr 06, 2021
by
Aurel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix zope patch
parent
e2cc4ba3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
component/egg-patch/Zope/0001-OFS-XMLExportImport.patch
component/egg-patch/Zope/0001-OFS-XMLExportImport.patch
+12
-12
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-1
stack/erp5/zope-versions.cfg
stack/erp5/zope-versions.cfg
+1
-1
No files found.
component/egg-patch/Zope/0001-OFS-XMLExportImport.patch
View file @
f1f4c429
diff -Naur Zope-4.5.3/OFS/XMLExportImport.py Zope-4.5.3-Nexedi/OFS/XMLExportImport.py
diff -Naur Zope-4.5.3/
src/
OFS/XMLExportImport.py Zope-4.5.3-Nexedi/OFS/XMLExportImport.py
--- Zope-4.5.3/OFS/XMLExportImport.py 1970-01-01 01:00:00.000000000 +0100
--- Zope-4.5.3/
src/
OFS/XMLExportImport.py 1970-01-01 01:00:00.000000000 +0100
+++ Zope-4.5.3-Nexedi/OFS/XMLExportImport.py 2021-03-09 16:11:55.000000000 +0100
+++ Zope-4.5.3-Nexedi/
src/
OFS/XMLExportImport.py 2021-03-09 16:11:55.000000000 +0100
@@ -0,0 +1,124 @@
@@ -0,0 +1,124 @@
+##############################################################################
+##############################################################################
+#
+#
...
@@ -126,9 +126,9 @@ diff -Naur Zope-4.5.3/OFS/XMLExportImport.py Zope-4.5.3-Nexedi/OFS/XMLExportImpo
...
@@ -126,9 +126,9 @@ diff -Naur Zope-4.5.3/OFS/XMLExportImport.py Zope-4.5.3-Nexedi/OFS/XMLExportImpo
+ r=p.Parse(data)
+ r=p.Parse(data)
+ outfile.seek(0)
+ outfile.seek(0)
+ return jar.importFile(outfile,clue)
+ return jar.importFile(outfile,clue)
diff -Naur Zope-4.5.3/Shared/DC/xml/__init__.py Zope-4.5.3-Nexedi/Shared/DC/xml/__init__.py
diff -Naur Zope-4.5.3/
src/
Shared/DC/xml/__init__.py Zope-4.5.3-Nexedi/Shared/DC/xml/__init__.py
--- Zope-4.5.3/Shared/DC/xml/__init__.py 1970-01-01 01:00:00.000000000 +0100
--- Zope-4.5.3/
src/
Shared/DC/xml/__init__.py 1970-01-01 01:00:00.000000000 +0100
+++ Zope-4.5.3-Nexedi/Shared/DC/xml/__init__.py 2021-03-09 16:13:49.000000000 +0100
+++ Zope-4.5.3-Nexedi/
src/
Shared/DC/xml/__init__.py 2021-03-09 16:13:49.000000000 +0100
@@ -0,0 +1,12 @@
@@ -0,0 +1,12 @@
+##############################################################################
+##############################################################################
+#
+#
...
@@ -142,9 +142,9 @@ diff -Naur Zope-4.5.3/Shared/DC/xml/__init__.py Zope-4.5.3-Nexedi/Shared/DC/xml/
...
@@ -142,9 +142,9 @@ diff -Naur Zope-4.5.3/Shared/DC/xml/__init__.py Zope-4.5.3-Nexedi/Shared/DC/xml/
+# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE
+#
+#
+##############################################################################
+##############################################################################
diff -Naur Zope-4.5.3/Shared/DC/xml/ppml.py Zope-4.5.3-Nexedi/Shared/DC/xml/ppml.py
diff -Naur Zope-4.5.3/
src/
Shared/DC/xml/ppml.py Zope-4.5.3-Nexedi/Shared/DC/xml/ppml.py
--- Zope-4.5.3/Shared/DC/xml/ppml.py 1970-01-01 01:00:00.000000000 +0100
--- Zope-4.5.3/
src/
Shared/DC/xml/ppml.py 1970-01-01 01:00:00.000000000 +0100
+++ Zope-4.5.3-Nexedi/Shared/DC/xml/ppml.py 2021-03-09 16:13:49.000000000 +0100
+++ Zope-4.5.3-Nexedi/
src/
Shared/DC/xml/ppml.py 2021-03-09 16:13:49.000000000 +0100
@@ -0,0 +1,597 @@
@@ -0,0 +1,597 @@
+##############################################################################
+##############################################################################
+#
+#
...
@@ -743,9 +743,9 @@ diff -Naur Zope-4.5.3/Shared/DC/xml/ppml.py Zope-4.5.3-Nexedi/Shared/DC/xml/ppml
...
@@ -743,9 +743,9 @@ diff -Naur Zope-4.5.3/Shared/DC/xml/ppml.py Zope-4.5.3-Nexedi/Shared/DC/xml/ppml
+ 'persistent': save_persis,
+ 'persistent': save_persis,
+ 'unicode': save_unicode,
+ 'unicode': save_unicode,
+ }
+ }
diff -Naur Zope-4.5.3/Shared/DC/xml/xyap.py Zope-4.5.3-Nexedi/Shared/DC/xml/xyap.py
diff -Naur Zope-4.5.3/
src/
Shared/DC/xml/xyap.py Zope-4.5.3-Nexedi/Shared/DC/xml/xyap.py
--- Zope-4.5.3/Shared/DC/xml/xyap.py 1970-01-01 01:00:00.000000000 +0100
--- Zope-4.5.3/
src/
Shared/DC/xml/xyap.py 1970-01-01 01:00:00.000000000 +0100
+++ Zope-4.5.3-Nexedi/Shared/DC/xml/xyap.py 2021-03-09 16:13:49.000000000 +0100
+++ Zope-4.5.3-Nexedi/
src/
Shared/DC/xml/xyap.py 2021-03-09 16:13:49.000000000 +0100
@@ -0,0 +1,117 @@
@@ -0,0 +1,117 @@
+"""Yet another XML parser
+"""Yet another XML parser
+
+
...
...
stack/erp5/buildout.cfg
View file @
f1f4c429
...
@@ -592,7 +592,7 @@ Acquisition-patch-options = -p1
...
@@ -592,7 +592,7 @@ Acquisition-patch-options = -p1
python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
python-magic-patch-options = -p1
python-magic-patch-options = -p1
# Zope 4 patches
# Zope 4 patches
Zope-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/0001-OFS-XMLExportImport.patch#
b1d932fb66874d57b130bb487d9517df
Zope-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/0001-OFS-XMLExportImport.patch#
1151b17dba08a2f60f433fb095e95549
Zope-patch-options = -p1
Zope-patch-options = -p1
[template-neo]
[template-neo]
...
@@ -816,4 +816,5 @@ eggtestinfo = 0.3
...
@@ -816,4 +816,5 @@ eggtestinfo = 0.3
zope.interface = 5.2.0
zope.interface = 5.2.0
ZConfig = 3.5.0
ZConfig = 3.5.0
Products.CMFCore = 2.4.0
Products.CMFCore = 2.4.0
#Products.PythonScripts = 2.13.2
#Products.GenericSetup = 1.8.6
#Products.GenericSetup = 1.8.6
\ No newline at end of file
stack/erp5/zope-versions.cfg
View file @
f1f4c429
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Version pins for required and commonly used dependencies.
# Version pins for required and commonly used dependencies.
[versions]
[versions]
Zope = 4.5.3
#
Zope = 4.5.3
Zope2 = 4.0
Zope2 = 4.0
# AccessControl 5+ no longer supports Zope 4.
# AccessControl 5+ no longer supports Zope 4.
AccessControl = 4.2
AccessControl = 4.2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment