(mail_address_url): don't add

mailto: to http://

diff --git a/ChangeLog b/ChangeLog
index 7086ace43089c3c075f51c8a6d972c8cd3a775c2..ac6cbf93a698e8c17f8cf51f77fc8e8b2f33eb6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * stepmake/bin/add-html-footer.py (mail_address_url): don't add
+       mailto: to http:// 
+
        * python/lilylib.py (print_environment): move ps_page_count to lilypond-book.py
 
 2006-03-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>

diff --git a/THANKS b/THANKS
index 52db802432ecf508adab71583fbd33dfa70b5ae0..2e20df43f9000353f17a5ef160e557780160d91d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -70,6 +70,7 @@ Eduardo Vieira
 Ernesto Gancedo
 François Vion
 Frédéric Bron
+Gianluca D.
 Hans Forbrich
 Hoang Nguyen
 Joe Neeman

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 314499433b90ce90af536b8c8a255d9654604b75..d406d3719a65a4e3bfc8f159047336f611220e18 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -23,6 +23,10 @@ try:
 except KeyError:
        pass
 
+mail_address_url= 'mailto:' + mail_address
+if re.search ("http://", mail_address):
+       mail_address_url = mail_address
+       
 webmaster= mail_address
 try:
        webmaster= os.environ['WEBMASTER']
@@ -51,7 +55,7 @@ built = r"""
 This page is for %(package_name)s-%(package_version)s (%(branch_str)s). <br>
 </font>
 <address><font size="-1">
-Report errors to &lt;<a href="mailto:%(mail_address)s">%(mail_address)s</a>&gt;.</font></address>
+Report errors to &lt;<a href="%(mail_address_url)s">%(mail_address)s</a>&gt;.</font></address>
 </p>
 </div>