[PATCH cygport] Raise an error if we package files in /usr/local

Jon Turney jon.turney@dronecode.org.uk
Sun May 9 14:58:19 GMT 2021


If we end up with files in /usr/local/ in a package, this tends to
suggest the prefix hasn't been applied somewhere, so raise an error.
---
 lib/pkg_pkg.cygpart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index 91e8768..d643426 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -243,7 +243,7 @@ __pkg_pkgcheck() {
 	sort < ${tmp1} > "${tmp1}.sorted";
 	mv -f "${tmp1}.sorted" ${tmp1};
 
-	if grep "\.stackdump$" ${tmp1} > ${T}/pkgcheck.lst
+	if grep -E "^usr/local|\.stackdump$" ${tmp1} > ${T}/pkgcheck.lst
 	then
 		warning "Packages contain unexpected files:";
 		cat ${T}/pkgcheck.lst;
-- 
2.31.1



More information about the Cygwin-apps mailing list