[Pkg-mailman-hackers] Pkg-mailman commit - rev 148 - branches/pkg-split/core/debian

[Bernd S. Brentrup]

Author: bsb
Date: 2004-05-22 04:09:24 -0600 (Sat, 22 May 2004)
New Revision: 148

Modified:
   branches/pkg-split/core/debian/mailman.config
Log:
If DEFAULT_HOSTNAME or DEFAULT_URL are set, init debconf
templates email_host and url_host from those values.

Modified: branches/pkg-split/core/debian/mailman.config
===================================================================
--- branches/pkg-split/core/debian/mailman.config	2004-05-22 09:56:48 UTC (rev 147)
+++ branches/pkg-split/core/debian/mailman.config	2004-05-22 10:09:24 UTC (rev 148)
@@ -69,10 +69,9 @@
 
 def main(operation, inst_version):
 
-    log('config main(operation=%(operation)r, '
-        'inst_version=%(inst_version)r)'
-        % locals(), lvl=2)
 
+    db.fset('mailman/create_site_list', 'seen', 'false')
+
     def db_input(*args):
         try:
             db.input(*args)
@@ -90,20 +89,23 @@
     mailname = mailname.read().strip()
 
     if os.path.exists(mm_cfg):
+        # At this point we can't assume a sensible Defaults.py is installed,
+        # execute relevant assignments ignoring errors.
         for line in os.popen('egrep "^DEFAULT_[^ =]+ *=" %(mm_cfg)s' % locals()):
-            exec line in gbls
-    if inst_version[:3] <= '2.0':
+            try: exec line in gbls
+            except: pass
+    if gbls.has_key('DEFAULT_HOST_NAME') or gbls.has_key('DEFAULT_URL'):
         from urlparse import urlsplit
-        default_email_host = gbls.get('DEFAULT_HOST_NAME', None)
-        default_url        = gbls.get('DEFAULT_URL', None)
+        default_email_host   = gbls.get('DEFAULT_HOST_NAME', mailname)
+        default_url          = gbls.get('DEFAULT_URL', None)
         if default_url:
             default_url_host = urlsplit(default_url)[1]
         else:
             default_url_host = None
     else:
-        default_email_host      = gbls.get('DEFAULT_EMAIL_HOST', mailname)
-        default_url_host        = gbls.get('DEFAULT_URL_HOST', '')
-    default_server_language = gbls.get('DEFAULT_SERVER_LANGUAGE', 'en')
+        default_email_host   = gbls.get('DEFAULT_EMAIL_HOST', mailname)
+        default_url_host     = gbls.get('DEFAULT_URL_HOST', '')
+    default_server_language  = gbls.get('DEFAULT_SERVER_LANGUAGE', 'en')
 
     if not default_url_host:
         default_url_host = default_email_host