Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Apr 2010 11:17:41 +0200
From:      Matthias Andree <matthias.andree@gmx.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        dougb@FreeBSD.org
Subject:   ports/145984: [PATCH] ports-mgmt/portmaster: Fix abort with --index and local port not yet in ports
Message-ID:  <E1O5F13-000DMl-Qr@apollo.emma.line.org>
Resent-Message-ID: <201004231715.o3NHFXHB083656@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         145984
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/portmaster: Fix abort with --index and local port not yet in ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 23 17:15:32 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 8.0-STABLE FreeBSD 8.0-STABLE #7: Thu Apr 22 09:23:41 CEST 2010
>Description:
Hi Doug,

the attached patch is needed for me to let portmaster survive a portmaster -a
-d --index; I have databases/db50 installed which isn't yet in ports (pending
mentor approval).  Without the patch, pkg_version -t will complain about
improper usage and cause portmaster to abort. WIth the patch, portmaster will
properly state that no updates are needed.

Port maintainer (dougb@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- portmaster-2.22.patch begins here ---
Index: files/portmaster.sh.in
===================================================================
RCS file: /home/ncvs/ports/ports-mgmt/portmaster/files/portmaster.sh.in,v
retrieving revision 2.22
diff -u -u -r2.22 portmaster.sh.in
--- files/portmaster.sh.in	11 Apr 2010 22:41:21 -0000	2.22
+++ files/portmaster.sh.in	23 Apr 2010 09:15:12 -0000
@@ -1167,7 +1167,7 @@
 
 	iport=$1 ; port_ver=$2 ; udf=$3
 
-	case `pkg_version -t $iport $port_ver` in
+	case `pkg_version -t "$iport" "$port_ver"` in
 	\<)	return 1 ;;
 	=)	return ;;
 	\>)	if [ -n "$PM_VERBOSE" ]; then
--- portmaster-2.22.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1O5F13-000DMl-Qr>