svn commit: r386985 - in head/security/vuxml: . files

[Xin LI]

Author: delphij
Date: Fri May 22 07:04:28 2015
New Revision: 386985
URL: https://svnweb.freebsd.org/changeset/ports/386985

Log:
  Pass full path to the vuln.xml file to extra-validation.py.  Without this,
  if .OBJDIR differs from .CURDIR, the validation would fail.
  
  PR:		193923
  Reported by:	jbeich

Modified:
  head/security/vuxml/Makefile
  head/security/vuxml/files/extra-validation.py

Modified: head/security/vuxml/Makefile
==============================================================================
--- head/security/vuxml/Makefile	Fri May 22 06:17:29 2015	(r386984)
+++ head/security/vuxml/Makefile	Fri May 22 07:04:28 2015	(r386985)
@@ -83,7 +83,7 @@ validate: tidy
 		${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \
 		return 1; \
 	fi
-	${PYTHON_CMD} ${FILESDIR}/extra-validation.py
+	${PYTHON_CMD} ${FILESDIR}/extra-validation.py ${VUXML_FILE}
 
 tidy: vuln.xml
 	@if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \

Modified: head/security/vuxml/files/extra-validation.py
==============================================================================
--- head/security/vuxml/files/extra-validation.py	Fri May 22 06:17:29 2015	(r386984)
+++ head/security/vuxml/files/extra-validation.py	Fri May 22 07:04:28 2015	(r386985)
@@ -5,7 +5,11 @@ import datetime
 import xml.etree.ElementTree as ET
 import sys
 
-tree = ET.parse('vuln.xml')
+if len(sys.argv) != 2:
+    print "Usage: %s vuln.xml" % (sys.argv[0])
+    sys.exit(1)
+
+tree = ET.parse(sys.argv[1])
 root = tree.getroot()
 
 namespace = "{http://www.vuxml.org/apps/vuxml-1}"