Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3986f007c7442bcbc85458555a32be1f10d73579
commit 3986f007c7442bcbc85458555a32be1f10d73579
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Jan 23 01:28:13 2008 +0100
makepkg: check if there are subpkgs before trying to clean them up
attemp to fix the "find: `pkg.*/': No such file or directory" bug
diff --git a/scripts/makepkg b/scripts/makepkg
index 41e4d6a..4921923 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1475,7 +1475,9 @@ cd $startdir
# unwanted files
msg "Removing unwanted files..."
-for f in `find {pkg,pkg.*}/usr/lib/perl? -type f 2> /dev/null` ; do
+extra=
+[ -n "$subpkgs" ] && extra=pkg.*/usr/lib/perl?
+for f in `find pkg/usr/lib/perl? $extra -type f 2> /dev/null` ; do
case "$f" in
*/.packlist|*/perllocal.pod)
rm -f "$f"
@@ -1483,8 +1485,10 @@ for f in `find {pkg,pkg.*}/usr/lib/perl? -type f 2>
/dev/null` ; do
;;
esac
done
+extra=
+[ -n "$subpkgs" ] && extra=pkg.*
rm -f {pkg,pkg.*}/{usr{,/local,/share},opt/*}/info/dir 2> /dev/null
-for f in `find {pkg,pkg.*}/ -type f -name encodings.dir -o -type f -name
fonts.dir -o -type f -name fonts.scale` ; do
+for f in `find pkg $extra -type f -name encodings.dir -o -type f -name
fonts.dir -o -type f -name fonts.scale` ; do
msg2 "`echo $f | sed 's|pkg[^/]\+||'`"
rm -f "$f"
done
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
