[GRASS-SVN] r64554 - grass/branches/releasebranch_7_0/scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-02-11 02:11:00 -0800 (Wed, 11 Feb 2015)
New Revision: 64554

Modified:
   grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
Log:
g.extension: fix http replacement handling (bugfix)
             message cosmetics
             (merge r64552 from trunk)


Modified: grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2015-02-11 10:06:18 UTC (rev 64553)
+++ grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2015-02-11 10:11:00 UTC (rev 64554)
@@ -805,7 +805,7 @@
     if force:
         grass.verbose(_("List of removed files:"))
     else:
-        grass.info(_("Files to be removed (use flag 'f' to force removal):"))
+        grass.info(_("Files to be removed:"))
 
     remove_modules(mlist, force)
 
@@ -814,8 +814,8 @@
         remove_extension_xml(mlist)
         grass.message(_("Extension <%s> successfully uninstalled.") % options['extension'])
     else:
-        grass.warning(_("Extension <%s> not removed.\n"
-                        "Re-run '%s' with 'f' flag to force removal") % (options['extension'], 'g.extension'))
+        grass.warning(_("Extension <%s> not removed. "
+                        "Re-run '%s' with '-f' flag to force removal") % (options['extension'], 'g.extension'))
 
 # remove existing extension(s) (reading XML file)
 def remove_modules(mlist, force = False):
@@ -984,7 +984,7 @@
     pattern = r'''<a href="([^"]+)">([^>]+)</a>'''
     addons = get_installed_extensions(force = True)
     for match in re.finditer(pattern, shtml):
-        if match.group(1)[:7] == 'http://':
+        if match.group(1)[:4] == 'http':
             continue
         if match.group(1).replace('.html', '') in addons:
             continue