Forráskód Böngészése

Fix handling of version number in manpages
Strip any leading blank lines


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

Glynn Clements 16 éve
szülő
commit
1df6a376d4
2 módosított fájl, 3 hozzáadás és 2 törlés
  1. 1 1
      man/Makefile
  2. 2 1
      tools/g.html2man/g.html2man.py

+ 1 - 1
man/Makefile

@@ -7,7 +7,7 @@ SECT = 1
 MANDIR  = $(GISBASE)/man/man$(SECT)
 HTMLDIR = $(GISBASE)/docs/html
 #HTML2MAN = GRASS_PERL=${PERL} VERSION_NUMBER=${GRASS_VERSION_NUMBER} sh $(GRASS_HOME)/tools/g.html2man/g.html2man
-HTML2MAN = $(GRASS_HOME)/tools/g.html2man/g.html2man.py
+HTML2MAN = VERSION_NUMBER=${GRASS_VERSION_NUMBER} $(GRASS_HOME)/tools/g.html2man/g.html2man.py
 
 MANPAGES := $(patsubst $(HTMLDIR)/%.html,$(MANDIR)/%.$(SECT),$(wildcard $(HTMLDIR)/*.html))
 

+ 2 - 1
tools/g.html2man/g.html2man.py

@@ -9,7 +9,7 @@ from htmlentitydefs import entitydefs
 from StringIO import StringIO
 
 try:
-    version = os.environ['GRASS_VERSION_NUMBER']
+    version = os.environ['VERSION_NUMBER']
 except:
     version = ""
 
@@ -354,6 +354,7 @@ if __name__ == "__main__":
     # strip excess whitespace
     blank_re = re.compile("[ \t\n]*\n[ \t\n]*")
     s = blank_re.sub('\n', s)
+    s = s.lstrip()
 
     # write groff
     outf = file(sys.argv[2], 'w')