From owner-svn-src-user@FreeBSD.ORG  Sun Jun 10 08:11:51 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B2A86106564A;
	Sun, 10 Jun 2012 08:11:51 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E2C18FC15;
	Sun, 10 Jun 2012 08:11:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5A8BptU082403;
	Sun, 10 Jun 2012 08:11:51 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5A8BpWd082401;
	Sun, 10 Jun 2012 08:11:51 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201206100811.q5A8BpWd082401@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 10 Jun 2012 08:11:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236842 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jun 2012 08:11:51 -0000

Author: dougb
Date: Sun Jun 10 08:11:51 2012
New Revision: 236842
URL: http://svn.freebsd.org/changeset/base/236842

Log:
  If the second argument to -o is something that is completely non-existent,
  properly report what the user typed in the error message.
  
  Reported by:	avilla

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Jun 10 07:57:49 2012	(r236841)
+++ user/dougb/portmaster/portmaster	Sun Jun 10 08:11:51 2012	(r236842)
@@ -3113,7 +3113,11 @@ else
 			find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}
 			unset glob_dirs
 		fi
-		[ -n "$ro_upg_port" ] && ro_opd=`origin_from_pdb $ro_upg_port`
+		if [ -n "$ro_upg_port" ]; then
+			ro_opd=`origin_from_pdb $ro_upg_port`
+		else
+			ro_opd=$arg2
+		fi
 	esac
 	unset arg2