[Python-apps-commits] r7875 - in packages/openerp6/trunk (2 files)

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

    Date: Tuesday, November 29, 2011 @ 20:06:12
  Author: xnox-guest
Revision: 7875

Publisher warranty patch

Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/patches/config-comments.patch

Modified: packages/openerp6/trunk/debian/patches/config-comments.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/config-comments.patch	2011-11-29 20:06:02 UTC (rev 7874)
+++ packages/openerp6/trunk/debian/patches/config-comments.patch	2011-11-29 20:06:12 UTC (rev 7875)
@@ -8,11 +8,9 @@
 X-Bzr-Revision-Id: dmitrijs.ledkovs at credativ.co.uk-20111124194546-987wg7fr0tlozbob
 
 === modified file 'bin/tools/config.py'
-Index: credativ-6.0-server/bin/tools/config.py
-===================================================================
---- credativ-6.0-server.orig/bin/tools/config.py
-+++ credativ-6.0-server/bin/tools/config.py
-@@ -26,6 +26,7 @@ import sys
+--- a/bin/tools/config.py
++++ b/bin/tools/config.py
+@@ -26,6 +26,7 @@
  import netsvc
  import logging
  import release
@@ -20,7 +18,22 @@
  
  def check_ssl():
      try:
-@@ -463,12 +464,26 @@ class configmanager(object):
+@@ -93,12 +94,12 @@
+             'static_http_url_prefix': None,
+             'secure_cert_file': 'server.cert',
+             'secure_pkey_file': 'server.pkey',
+-            'publisher_warranty_url': 'http://services.openerp.com/publisher-warranty/',
++            'publisher_warranty_url': None,
+             'osv_memory_count_limit': None, # number of records in each osv_memory virtual table
+             'osv_memory_age_limit': 1, # hours
+         }
+         
+-        self.blacklist_for_save = set(["publisher_warranty_url", "load_language"])
++        self.blacklist_for_save = set(["load_language"])
+ 
+         self.misc = {}
+         self.config_file = fname
+@@ -463,12 +464,36 @@
      def save(self):
          p = ConfigParser.ConfigParser()
          loglevelnames = dict(zip(self._LOGLEVELS.values(), self._LOGLEVELS.keys()))
@@ -29,8 +42,18 @@
 +        for group in self.parser.option_groups:
 +            for option in group.option_list:
 +                comments[option.dest] = option.help
-+        comments['admin_passwd'] = "Set superadmin password"
-+        defaults['admin_passwd'] = "admin"
++        comments.update({
++            'admin_passwd': 'Set superadmin password',
++            'publisher_warranty_url': """\
++Call-home URL for usage statistics, downloading and injecting data into your \
++database, submitting bug reports for OpenERP support contracts. \
++Upstream Default: 'http://services.openerp.com/publisher-warranty/'
++"""})
++        defaults.update({
++            'admin_passwd':'admin',
++            'publisher_warranty_url': '',
++            })
++
          p.add_section('options')
          for opt in sorted(self.options.keys()):
 -            if opt in ('version', 'language', 'translate_out', 'translate_in', 'overwrite_existing_translations', 'init', 'update'):