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

[Bernd S. Brentrup]

Author: bsb
Date: 2004-05-19 10:33:05 -0600 (Wed, 19 May 2004)
New Revision: 139

Modified:
   branches/pkg-split/core/debian/mailman.config
Log:
Use DEFAULT_HOST_NAME and DEFAULT_URL to initialize debconf templates
when DEFAULT_EMAIL_HOST and DEFAULT_URL_HOST are not available.
Fallback to /etc/mailname only if that fails.


Modified: branches/pkg-split/core/debian/mailman.config
===================================================================
--- branches/pkg-split/core/debian/mailman.config	2004-05-19 16:28:19 UTC (rev 138)
+++ branches/pkg-split/core/debian/mailman.config	2004-05-19 16:33:05 UTC (rev 139)
@@ -92,18 +92,27 @@
     if os.path.exists(mm_cfg):
         for line in os.popen('egrep "^DEFAULT_[^ =]+ *=" %(mm_cfg)s' % locals()):
             exec line in gbls
-    default_email_host      = gbls.get('DEFAULT_EMAIL_HOST', mailname)
-    default_url_host        = gbls.get('DEFAULT_URL_HOST', '')
+    if inst_version[:3] <= '2.0':
+        from urlparse import urlsplit
+        default_email_host = gbls.get('DEFAULT_HOST_NAME', None)
+        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')
 
-    db.set('mailman/email_host', default_email_host)
-    db_input(MEDIUM, 'mailman/email_host')
-
     if not default_url_host:
-        default_url_host = 'www.' + default_email_host
+        default_url_host = default_email_host
     db.set('mailman/url_host',   default_url_host)
     db_input(MEDIUM, 'mailman/url_host')
 
+    db.set('mailman/email_host', default_email_host)
+    db_input(MEDIUM, 'mailman/email_host')
+
     site_languages = db.get('mailman/site_languages')
     langs = site_languages.split(', ')
     if len(langs) > 1 and default_server_language not in langs: