[Python-apps-commits] r7883 - in packages/openerp6/trunk (7 files)

[xnox-guest at users.alioth.debian.org]

    Date: Tuesday, November 29, 2011 @ 20:11:45
  Author: xnox-guest
Revision: 7883

more patch fixes

Added:
  packages/openerp6/trunk/debian/patches/02_web/config-changes.patch
    (from rev 7882, packages/openerp6/trunk/debian/patches/02_web/config-changes)
  packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate.patch
    (from rev 7882, packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate)
Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace
  packages/openerp6/trunk/debian/patches/series
Deleted:
  packages/openerp6/trunk/debian/patches/02_web/config-changes
  packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate

Deleted: packages/openerp6/trunk/debian/patches/02_web/config-changes
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/config-changes	2011-11-29 20:11:39 UTC (rev 7882)
+++ packages/openerp6/trunk/debian/patches/02_web/config-changes	2011-11-29 20:11:45 UTC (rev 7883)
@@ -1,38 +0,0 @@
-Description: Change configuration file to fit the WSGI setup
-Author: Maximilian Gass <maximilian.gass at credativ.de>
-Forwarded: no
-
---- a/doc/openerp-web.cfg
-+++ b/doc/openerp-web.cfg
-@@ -1,13 +1,6 @@
- [global]
- server.environment = "development"
- 
--# Some server parameters that you may want to tweak
--server.socket_host = "0.0.0.0"
--server.socket_port = 8080
--
--# Sets the number of threads the server uses
--server.thread_pool = 10
--
- tools.sessions.on = True
- tools.sessions.persistent = False
- 
-@@ -60,6 +53,9 @@
- openerp.server.protocol = 'socket'
- openerp.server.timeout = 450
- 
-+# Do not spam the Apache error.log with access logs
-+log.screen = False
-+
- # Web client settings
- [openerp-web]
- # filter dblists based on url pattern?
-@@ -75,3 +71,7 @@
- 
- # will be applied on company logo
- company.url = ''
-+
-+[/]
-+tools.sessions.storage_type = 'file'
-+tools.sessions.storage_path = '/var/lib/openerp-web/sessions'

Copied: packages/openerp6/trunk/debian/patches/02_web/config-changes.patch (from rev 7882, packages/openerp6/trunk/debian/patches/02_web/config-changes)
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/config-changes.patch	                        (rev 0)
+++ packages/openerp6/trunk/debian/patches/02_web/config-changes.patch	2011-11-29 20:11:45 UTC (rev 7883)
@@ -0,0 +1,38 @@
+Description: Change configuration file to fit the WSGI setup
+Author: Maximilian Gass <maximilian.gass at credativ.de>
+Forwarded: no
+
+--- a/web/doc/openerp-web.cfg
++++ b/web/doc/openerp-web.cfg
+@@ -1,13 +1,6 @@
+ [global]
+ server.environment = "development"
+ 
+-# Some server parameters that you may want to tweak
+-server.socket_host = "0.0.0.0"
+-server.socket_port = 8080
+-
+-# Sets the number of threads the server uses
+-server.thread_pool = 10
+-
+ tools.sessions.on = True
+ tools.sessions.persistent = False
+ 
+@@ -60,6 +53,9 @@
+ openerp.server.protocol = 'socket'
+ openerp.server.timeout = 450
+ 
++# Do not spam the Apache error.log with access logs
++log.screen = False
++
+ # Web client settings
+ [openerp-web]
+ # filter dblists based on url pattern?
+@@ -75,3 +71,7 @@
+ 
+ # will be applied on company logo
+ company.url = ''
++
++[/]
++tools.sessions.storage_type = 'file'
++tools.sessions.storage_path = '/var/lib/web/openerp-web/sessions'

Modified: packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace	2011-11-29 20:11:39 UTC (rev 7882)
+++ packages/openerp6/trunk/debian/patches/02_web/fix-popup-namespace	2011-11-29 20:11:45 UTC (rev 7883)
@@ -1,5 +1,5 @@
---- a/addons/openerp/controllers/actions.py
-+++ b/addons/openerp/controllers/actions.py
+--- a/web/addons/openerp/controllers/actions.py
++++ b/web/addons/openerp/controllers/actions.py
 @@ -366,7 +366,7 @@
             urllib.urlencode({'payload': compressed_payload}))
  

Deleted: packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate	2011-11-29 20:11:39 UTC (rev 7882)
+++ packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate	2011-11-29 20:11:45 UTC (rev 7883)
@@ -1,19 +0,0 @@
-Description: Add missing __getstate__ method to TinyDict
-Author: Maximilian Gass <maximilian.gass at credativ.de>
-Forwarded: no
-
---- a/addons/openerp/utils/utils.py
-+++ b/addons/openerp/utils/utils.py
-@@ -132,6 +132,12 @@
-         nm = '_terp_%s' % name
-         return self.get(nm, self.get(name, None))
- 
-+    # if __getaddr__ and __setaddr__ are defined, one also needs to
-+    # define __getstate__, otherwise pickle will fail. pickle is used
-+    # by the file backend of CherryPy's session storage
-+    def __getstate__(self):
-+        return self.__dict__
-+
-     def __setitem__(self, name, value):
-         value = self._eval(value)
-         super(TinyDict, self).__setitem__(name, value)

Copied: packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate.patch (from rev 7882, packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate)
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate.patch	                        (rev 0)
+++ packages/openerp6/trunk/debian/patches/02_web/tinydict-getstate.patch	2011-11-29 20:11:45 UTC (rev 7883)
@@ -0,0 +1,19 @@
+Description: Add missing __getstate__ method to TinyDict
+Author: Maximilian Gass <maximilian.gass at credativ.de>
+Forwarded: no
+
+--- a/web/addons/openerp/utils/utils.py
++++ b/web/addons/openerp/utils/utils.py
+@@ -132,6 +132,12 @@
+         nm = '_terp_%s' % name
+         return self.get(nm, self.get(name, None))
+ 
++    # if __getaddr__ and __setaddr__ are defined, one also needs to
++    # define __getstate__, otherwise pickle will fail. pickle is used
++    # by the file backend of CherryPy's session storage
++    def __getstate__(self):
++        return self.__dict__
++
+     def __setitem__(self, name, value):
+         value = self._eval(value)
+         super(TinyDict, self).__setitem__(name, value)

Modified: packages/openerp6/trunk/debian/patches/series
===================================================================
--- packages/openerp6/trunk/debian/patches/series	2011-11-29 20:11:39 UTC (rev 7882)
+++ packages/openerp6/trunk/debian/patches/series	2011-11-29 20:11:45 UTC (rev 7883)
@@ -2,10 +2,10 @@
 01_server/config-comments.patch
 01_server/fix-yaml-import.patch
 01_server/manpage-whatis.patch
-02_web/config-changes
+02_web/config-changes.patch
 02_web/fix-popup-namespace
 02_web/fix-refresh-loop.patch
-02_web/tinydict-getstate
+02_web/tinydict-getstate.patch
 02_web/wsgi-x-location.patch
 stable_updates/addons.patch
 stable_updates/client.patch