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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-02-22 01:40:45 -0800 (Sun, 22 Feb 2015)
New Revision: 64722

Modified:
   grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
Log:
g.extension: message cosmetics (addons metadata)
(merge r64721 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-22 09:39:17 UTC (rev 64721)
+++ grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2015-02-22 09:40:45 UTC (rev 64722)
@@ -198,7 +198,7 @@
         if force:
             write_xml_modules(fXML)
         else:
-            grass.warning(_("No metadata file available"))
+            grass.warning(_("No addons metadata file available"))
         return []
 
     # read XML file
@@ -257,7 +257,7 @@
             for mnode in tnode.findall('task'):
                 mlist.append(mnode.get('name'))
     except HTTPError:
-        grass.fatal(_("Unable to fetch metadata file"))
+        grass.fatal(_("Unable to fetch addons metadata file"))
 
     return tdict
 
@@ -276,7 +276,7 @@
                     tlist.append(mnode.get('name'))
                 break
     except HTTPError:
-        grass.fatal(_("Unable to fetch metadata file"))
+        grass.fatal(_("Unable to fetch addons metadata file"))
 
     return tlist
 
@@ -335,9 +335,9 @@
     pattern = re.compile(r'(<li><a href=".+">)(.+)(</a></li>)', re.IGNORECASE)
 
     if flags['c']:
-        grass.warning(_("Flag 'c' ignored, metadata file not available"))
+        grass.warning(_("Flag 'c' ignored, addons metadata file not available"))
     if flags['g']:
-        grass.warning(_("Flag 'g' ignored, metadata file not available"))
+        grass.warning(_("Flag 'g' ignored, addons metadata file not available"))
 
     prefix = ['d', 'db', 'g', 'i', 'm', 'ps',
               'p', 'r', 'r3', 's', 'v']
@@ -488,7 +488,7 @@
     if ret != 0:
         grass.warning(_('Installation failed, sorry. Please check above error messages.'))
     else:
-        grass.message(_("Updating metadata file..."))
+        grass.message(_("Updating addons metadata file..."))
         blist = install_extension_xml(url, mlist)
         for module in blist:
             update_manual_page(module)
@@ -524,13 +524,13 @@
                 'modules'   : mlist,
                 }
     except HTTPError:
-        grass.error(_("Unable to read metadata file from the remote server"))
+        grass.error(_("Unable to read addons metadata file from the remote server"))
 
     if not data:
-        grass.warning(_("No metadata available"))
+        grass.warning(_("No addons metadata available"))
         return
     if name not in data:
-        grass.warning(_("No metadata available for <%s>") % name)
+        grass.warning(_("No addons metadata available for <%s>") % name)
         return
 
     fXML = os.path.join(options['prefix'], 'toolboxes.xml')
@@ -587,7 +587,7 @@
         try:
             tree = etree.fromstring(f.read())
         except:
-            grass.warning(_("Unable to parse '%s'. Metadata file not updated.") % url)
+            grass.warning(_("Unable to parse '%s'. Addons metadata file not updated.") % url)
             return bList
 
         for mnode in tree.findall('task'):
@@ -620,10 +620,10 @@
                 }
 
     except:
-        grass.error(_("Unable to read metadata file from the remote server"))
+        grass.error(_("Unable to read addons metadata file from the remote server"))
 
     if not data:
-        grass.warning(_("No metadata available"))
+        grass.warning(_("No addons metadata available"))
         return []
 
     fXML = os.path.join(options['prefix'], 'modules.xml')
@@ -645,7 +645,7 @@
                 break
 
         if name not in data:
-            grass.warning(_("No metadata found for <%s>") % name)
+            grass.warning(_("No addons metadata found for <%s>") % name)
             continue
 
         ndata = data[name]
@@ -814,7 +814,7 @@
     remove_modules(mlist, force)
 
     if force:
-        grass.message(_("Updating metadata file..."))
+        grass.message(_("Updating addons metadata file..."))
         remove_extension_xml(mlist)
         grass.message(_("Extension <%s> successfully uninstalled.") % options['extension'])
     else: