Explorar o código

g.extension: fix http replacement handling
message cosmetics


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64552 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa %!s(int64=10) %!d(string=hai) anos
pai
achega
1dd5652c8e
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      scripts/g.extension/g.extension.py

+ 4 - 4
scripts/g.extension/g.extension.py

@@ -809,7 +809,7 @@ def remove_extension(force = False):
     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)
 
@@ -818,8 +818,8 @@ def remove_extension(force = False):
         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):
@@ -988,7 +988,7 @@ def update_manual_page(module):
     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