Page MenuHomeFreeBSD
Files F168833816

D13571.id36861.diff
No OneTemporary
Actions

D13571.id36861.diff
View Options

Index: head/Mk/Scripts/qa.sh
===================================================================
--- head/Mk/Scripts/qa.sh
+++ head/Mk/Scripts/qa.sh
@@ -48,7 +48,7 @@
/bin/rc)
# whitelist some interpreters
;;
- ${LOCALBASE}/bin/python|${PREFIX}/bin/python)
+ ${LOCALBASE}/bin/python|${PREFIX}/bin/python|${LOCALBASE}/bin/python2|${PREFIX}/bin/python2|${LOCALBASE}/bin/python3|${PREFIX}/bin/python3)
badinterp="${interp}"
;;
${LINUXBASE}/*) ;;
@@ -69,7 +69,7 @@
/usr/bin/env)
interparg=$(sed -n -e '1s/^#![[:space:]]*[^[:space:]]*[[:space:]]*\([^[:space:]]*\).*/\1/p;2q' "${f}")
case "${interparg}" in
- python)
+ python|python2|python3)
badinterp="${interp} ${interparg}"
;;
esac
Index: head/Mk/Uses/shebangfix.mk
===================================================================
--- head/Mk/Uses/shebangfix.mk
+++ head/Mk/Uses/shebangfix.mk
@@ -65,6 +65,13 @@
${lang}_OLD_CMD+= /usr/local/bin/${lang}
.endfor
+.for pyver in 2 3
+python_OLD_CMD+= "/usr/bin/env python${pyver}"
+python_OLD_CMD+= /bin/python${pyver}
+python_OLD_CMD+= /usr/bin/python${pyver}
+python_OLD_CMD+= /usr/local/bin/python${pyver}
+.endfor
+
.for lang in ${SHEBANG_LANG}
. if !defined(${lang}_CMD)
IGNORE+= missing definition for ${lang}_CMD

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 31, 9:08 AM (5 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37588775
Default Alt Text
D13571.id36861.diff (1 KB)

Event Timeline