summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-09-29 13:54:31 +0200
committerDan McGee <dan@archlinux.org>2010-10-05 17:58:21 +0200
commitf2296aab89b12fe49204fba8f62dc8dd2d9e05eb (patch)
tree4cae483d57ca36391e5cbdcc3b08c173462e1ee4
parent022ec3dbb76686337969cee6e14113b397987cfa (diff)
downloadpacman-f2296aab89b12fe49204fba8f62dc8dd2d9e05eb.tar.gz
pacman-f2296aab89b12fe49204fba8f62dc8dd2d9e05eb.tar.xz
makepkg: improve srcdir check and add pkgdir
The checking of the package for $srcdir references was overly sensitive and gave a lot of what appear to be false positives with binary files (in particular with debugging symbols kept). Restrict the search for $srcdir to non-binary files as this should still catch the majority of configuration issues the check was initially designed to catch. Also, add a similar check for $pkgdir. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ed1380d1..9bcd4460 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -972,10 +972,14 @@ check_package() {
fi
done
- # check for references to the build directory
- if find "${pkgdir}" -type f -exec grep -q "${srcdir}" {} +; then
+ # check for references to the build and package directory
+ if find "${pkgdir}" -type f -exec grep -q -I "${srcdir}" {} +; then
warning "$(gettext "Package contains reference to %s")" "\$srcdir"
fi
+ if find "${pkgdir}" -type f -exec grep -q -I "${pkgdir}" {} +; then
+ warning "$(gettext "Package contains reference to %s")" "\$pkgdir"
+ fi
+
}
create_package() {