Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Jun 2012 08:11:51 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r236842 - user/dougb/portmaster
Message-ID:  <201206100811.q5A8BpWd082401@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206100811.q5A8BpWd082401>