[GRASS-SVN] r40113 - in grass/trunk: gui/wxpython/gui_modules man

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-12-22 09:49:19 -0500 (Tue, 22 Dec 2009)
New Revision: 40113

Modified:
   grass/trunk/gui/wxpython/gui_modules/help.py
   grass/trunk/man/build_html.py
Log:
don't include revision number in manual


Modified: grass/trunk/gui/wxpython/gui_modules/help.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/help.py	2009-12-22 14:21:10 UTC (rev 40112)
+++ grass/trunk/gui/wxpython/gui_modules/help.py	2009-12-22 14:49:19 UTC (rev 40113)
@@ -373,7 +373,6 @@
 
         # get version and web site
         version, svn_gis_h_rev, svn_gis_h_date = gcmd.RunCommand('g.version',
-                                                                 verbose = True, # -> svn revision
                                                                  flags = 'r',
                                                                  read = True).splitlines()
 

Modified: grass/trunk/man/build_html.py
===================================================================
--- grass/trunk/man/build_html.py	2009-12-22 14:21:10 UTC (rev 40112)
+++ grass/trunk/man/build_html.py	2009-12-22 14:49:19 UTC (rev 40113)
@@ -78,7 +78,7 @@
     <tr>
       <td valign="top" bgcolor="${box_color}" class="box"><h3>&nbsp;Quick Introduction</h3>
       <ul>
-      <li><a href="grass6.html">GRASS startup manual page</a></li>
+      <li><a href="grass7.html">GRASS startup manual page</a></li>
       <li><a href="helptext.html">How to start with GRASS</a></li>
       </ul></td>
 
@@ -331,7 +331,10 @@
 html_dir = os.path.join(arch_dist_dir, "docs", "html")
 gisbase = os.environ['GISBASE']
 ver = read_file(os.path.join(gisbase, "etc", "VERSIONNUMBER"))
-grass_version = ver.strip()
+try:
+    grass_version = ver.split()[0].strip()
+except IndexError:
+    grass_version = ver.split().strip()
 grass_mmver = '.'.join(ver.split('.')[0:2])
 macosx = "darwin" in os.environ['ARCH'].lower()