ports/110125: portmaster 1.15 bug in find_and_delete_distfiles function

[Simon Phoenix]

>Number:         110125
>Category:       ports
>Synopsis:       portmaster 1.15 bug in find_and_delete_distfiles function
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 09 11:40:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Simon Phoenix
>Release:        6.2-STABLE
>Organization:
Phoenix Lab.
>Environment:
FreeBSD sp0-host.lan 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Feb 10 22:05:58 EET 2007     phoenix at sp0-host.lan:/usr/obj/usr/src/sys/PHOENIX  i386
>Description:
Little bug in find_and_delete_distfiles function in portmaster 1.15.
When portmaster find and delete disfiles i have this message:

[...]
install-info --quiet /usr/local/info/standards261.info /usr/local/info/dir
===>   Compressing manual pages for autoconf-2.61
===>   Registering installation for autoconf-2.61
===>  Cleaning for autoconf-2.61

===>>> Upgrade for devel/autoconf261 to autoconf-2.61 succeeded
[: grep: unexpected operator
===>>> Delete autoconf-000227.tar.bz2? [n]
[: grep: unexpected operator
===>>> Delete autoconf-2.53.tar.bz2? [n]
[...]

More detailed report (with set -vx in bash):
+ [ ! -d autoconf-2.53.tar.bz2 ]
+ grep -q (autoconf-2.53.tar.bz2) /tmp/DI-FILES-5309.3yIGg13X
+ [ -n  ]
+ echo -n ===>>> Delete autoconf-2.53.tar.bz2? [n]
===>>> Delete autoconf-2.53.tar.bz2? [n] + read DELORNOT

+ [ ! -d autoconf-2.59.tar.bz2 ]
+ grep -q (autoconf-2.59.tar.bz2) /tmp/DI-FILES-5309.3yIGg13X
+ [ -n  ]
+ echo -n ===>>> Delete autoconf-2.59.tar.bz2? [n]
===>>> Delete autoconf-2.59.tar.bz2? [n] + read DELORNOT
>How-To-Repeat:
Just try update software.
>Fix:
Fix find_and_delete_distfiles function with patch.
(Sorry, I can't attach patch, I just paste it here.)

--- /usr/local/sbin/portmaster	Fri Mar  9 05:13:00 2007
+++ /usr/home/phoenix/projects/patches/portmaster	Fri Mar  9 13:07:00 2007
@@ -684,7 +684,7 @@
 			continue	# Do not delete current version
 			;;
 		*)	[ ! -d "$file" ] || continue
-			[ grep -q \(${file}\) $DI_FILES ] && continue
+			grep -q \(${file}\) $DI_FILES && continue
 
 			if [ -n "$ALWAYS_SCRUB_DISTFILES" ]; then
 				echo "===>>> Deleting stale distfile: $file"

>Release-Note:
>Audit-Trail:
>Unformatted: