aboutsummaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>2001-10-15 04:00:31 +0800
committerasami <asami@FreeBSD.org>2001-10-15 04:00:31 +0800
commit926f0991cb2a926cf440acf76eb678368efcc41b (patch)
tree4c089239bd410994afd69535f9023ffc2f010b0f /Tools
parentaa699e91adca1213a2f93453a9d1b5128692f36b (diff)
downloadfreebsd-ports-gnome-926f0991cb2a926cf440acf76eb678368efcc41b.tar.gz
freebsd-ports-gnome-926f0991cb2a926cf440acf76eb678368efcc41b.tar.zst
freebsd-ports-gnome-926f0991cb2a926cf440acf76eb678368efcc41b.zip
Add another check for duplicate installations of same port. Only
search for logs in toplevel directory. A couple of cosmetic changes.
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/portbuild/scripts/processlogs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/processlogs b/Tools/portbuild/scripts/processlogs
index dc606fd41caf..bc1fc8ddd66d 100755
--- a/Tools/portbuild/scripts/processlogs
+++ b/Tools/portbuild/scripts/processlogs
@@ -7,7 +7,7 @@ find $of -mtime 2 -delete 2>/dev/null
if [ -f $of ]; then exit; fi
-if [ -e .stamp -a $(echo $(find . -newer .stamp -type f -name '*.log' 2>/dev/null | wc -l)) = "0" ]; then exit; fi
+if [ -e .stamp -a $(echo $(find . -maxdepth 1 -newer .stamp -type f -name '*.log' 2>/dev/null | wc -l)) = "0" ]; then exit; fi
echo "<html><head><title>Package building errors</title>" >$of
echo "<h1>Package building errors</h1>" >>$of
@@ -50,7 +50,7 @@ else
echo -n "<a href=\"mailto:$maint\">$maint</a>" >>$of
echo -n "</td><td>" >>$of
if grep -q 'list of extra files and directories' $1; then
- reason="extra"; tag="extra"
+ reason="mtree"; tag="mtree"
elif grep -q 'Checksum mismatch' $1; then
reason="checksum"; tag="checksum"
elif grep -qE '(No checksum recorded for|(Maybe|Either) .* is out of date, or)' $1; then
@@ -113,8 +113,10 @@ else
reason="PLIST"; tag="plist"
elif grep -q "Can't open display" $1; then
reason="DISPLAY"; tag="display"
+ elif grep -q " is already installed - perhaps an older version" $1; then
+ reason="depend object"; tag="dependobj"
elif grep -q "error in dependency .*, exiting" $1; then
- reason="dependency"; tag="dependency"
+ reason="depend package"; tag="dependpkg"
else
reason="???"; tag="unknown"
fi