kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Don't try to pkg_delete packages that are not installed (the usual

Browse source 
cause is because it was specified in the list twice)

* Don't panic when the list of packages to delete becomes empty

* When unexpected filesystem changes are detected, bail immediately
  instead of proceeding and hiding the error in the middle of
  the log
This commit is contained in:
Kris Kennaway 2006-02-15 07:39:48 +00:00
parent 4787e51b8b
commit bb3de95c29
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=156091
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Tools/portbuild/scripts/buildscript
View file

@ -97,12 +97,12 @@ del_pkg() {
if [ -s /var/db/pkg/${base}/+REQUIRED_BY ]; then
recursion=1
nextpkg="${base} ${nextpkg}"
else
elif [ -d /var/db/pkg/${base}/ ]; then
delpkg="${base} ${delpkg}"
fi
done
pkgs="${nextpkg}"
if [ "$dellist" = "$delpkg" ]; then
if [ "$dellist" != "" -a "$dellist" = "$delpkg" ]; then
echo "deleted list =\""$dellist"\", packages to delete ="\"$delpkg\"
echo "The following packages were left behind (perhaps your dependency list is incomplete):"
ls /var/db/pkg
@ -303,6 +303,7 @@ EOF
mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list3
# Compare the state of the filesystem now to before the 'make install' phase
dirty=0
if [ -s /tmp/list3 ]; then
cd /
grep ' extra$' /tmp/list3 | awk '{print $1}' | xargs -J % find % -ls > /tmp/list4
@ -311,9 +312,11 @@ EOF
if [ "x${NOPLISTCHECK}" = "x" ]; then
if grep -vqE "($X|$L)/etc/" /tmp/list4; then
echo "1" > /tmp/status
dirty=1
fi
if [ -s /tmp/list5 ]; then
if [ -s /tmp/list5 -o -s /tmp/list6 ]; then
echo "1" > /tmp/status
dirty=1
fi
fi
echo "================================================================"
@ -333,9 +336,9 @@ EOF
if [ -s /tmp/list6 ]; then
echo "list of filesystem changes from before and after port installation and deinstallation"
cat /tmp/list6
if [ "x${NOPLISTCHECK}" = "x" ]; then
echo "1" > /tmp/status
fi
fi
if [ "${dirty}" = 1 ]; then
cleanup 0
fi
# BUILD_DEPENDS and RUN_DEPENDS are both present at install-time (e.g. gmake)