瀏覽代碼

Use non-zero exit code if errors occur

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33072 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 17 年之前
父節點
當前提交
3b6e23ad2e
共有 2 個文件被更改,包括 7 次插入6 次删除
  1. 0 5
      man/Makefile
  2. 7 1
      tools/g.html2man/g.html2man.py

+ 0 - 5
man/Makefile

@@ -6,16 +6,11 @@ include $(MODULE_TOPDIR)/include/Make/Dir.make
 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 = VERSION_NUMBER=${GRASS_VERSION_NUMBER} $(GRASS_HOME)/tools/g.html2man/g.html2man.py
 
 MANPAGES := $(patsubst $(HTMLDIR)/%.html,$(MANDIR)/%.$(SECT),$(wildcard $(HTMLDIR)/*.html))
 
-ifeq ($(PERL),no)
-default:
-else
 default: $(MANPAGES)
-endif
 
 $(MANDIR):
 	$(MKDIR) $(MANDIR)

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

@@ -432,7 +432,7 @@ class MyHTMLParser(HTMLParser):
 	    if self.pop() == tag:
 		break
 
-if __name__ == "__main__":
+def main():
     # parse HTML
     inf = file(sys.argv[1])
     p = MyHTMLParser()
@@ -456,3 +456,9 @@ if __name__ == "__main__":
     outf = file(sys.argv[2], 'w')
     outf.write(s)
     outf.close()
+
+if __name__ == "__main__":
+    try:
+	main()
+    except:
+	sys.exit(1)