Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jun 2013 21:20:50 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r321330 - in head/security/vuxml: . files
Message-ID:  <201306192120.r5JLKoDF072290@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Wed Jun 19 21:20:50 2013
New Revision: 321330
URL: http://svnweb.freebsd.org/changeset/ports/321330

Log:
  Add extra-validation to the validation target.
  
  While here, test with python2 and permit the script to run with either 2 or 3.
  
  Requested by:	delphij
  With Hat:	ports-secteam

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

Modified: head/security/vuxml/Makefile
==============================================================================
--- head/security/vuxml/Makefile	Wed Jun 19 21:14:50 2013	(r321329)
+++ head/security/vuxml/Makefile	Wed Jun 19 21:20:50 2013	(r321330)
@@ -18,6 +18,8 @@ RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/te
 		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:${PORTSDIR}/textproc/xhtml-modularization \
 		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:${PORTSDIR}/textproc/xhtml-basic
 
+USE_PYTHON_RUN=	yes
+
 NO_MTREE=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}
@@ -91,6 +93,7 @@ validate: tidy
 		${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \
 		return 1; \
 	fi
+	${PYTHON_CMD} files/extra-validation.py
 
 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	Wed Jun 19 21:14:50 2013	(r321329)
+++ head/security/vuxml/files/extra-validation.py	Wed Jun 19 21:20:50 2013	(r321330)
@@ -1,11 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # $FreeBSD$
 
 import datetime
 import xml.etree.ElementTree as ET
 import sys
 
-tree = ET.parse('../vuln.xml')
+tree = ET.parse('vuln.xml')
 root = tree.getroot()
 
 namespace = "{http://www.vuxml.org/apps/vuxml-1}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306192120.r5JLKoDF072290>