pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove traces of mistakenly (?) installed ${PYSITELIB}/test/__init__.* as it's prone to name conflicts over the file name, e.g. with py-napalm-iosxr...



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon May 22 15:46:22 2017 +0200
Changeset:	0d9208834fe7764757adac8b0ad11fc932820172

Modified Files:
	py-napalm-base/Makefile
	py-napalm-base/PLIST

Log Message:
Remove traces of mistakenly (?) installed
${PYSITELIB}/test/__init__.*
as it's prone to name conflicts over the file name, e.g.
with py-napalm-iosxr...

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0d9208834fe7764757adac8b0ad11fc932820172

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-napalm-base/Makefile | 4 ++++
 py-napalm-base/PLIST    | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs:
diff --git a/py-napalm-base/Makefile b/py-napalm-base/Makefile
index a030c1705a..ae027ff61b 100644
--- a/py-napalm-base/Makefile
+++ b/py-napalm-base/Makefile
@@ -16,5 +16,9 @@ DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-netaddr-[0-9]*:../../net/py-netaddr
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
+# Mistakenly installed, prone to name conflicts (e.g. with napalm-iosxr)
+post-install:
+	rm -f ${DESTDIR}/${PREFIX}/${PYSITELIB}/test/__init__.*
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-napalm-base/PLIST b/py-napalm-base/PLIST
index be7ee153cd..46d7152563 100644
--- a/py-napalm-base/PLIST
+++ b/py-napalm-base/PLIST
@@ -74,6 +74,3 @@ ${PYSITELIB}/napalm_base/utils/string_parsers.pyo
 ${PYSITELIB}/napalm_base/validate.py
 ${PYSITELIB}/napalm_base/validate.pyc
 ${PYSITELIB}/napalm_base/validate.pyo
-${PYSITELIB}/test/__init__.py
-${PYSITELIB}/test/__init__.pyc
-${PYSITELIB}/test/__init__.pyo


Home | Main Index | Thread Index | Old Index