Date: Tue, 6 Sep 2011 03:17:11 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225412 - user/dougb/portmaster Message-ID: <201109060317.p863HB1e065880@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Tue Sep 6 03:17:11 2011 New Revision: 225412 URL: http://svn.freebsd.org/changeset/base/225412 Log: The -a option needs the same check as -r Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Tue Sep 6 02:31:57 2011 (r225411) +++ user/dougb/portmaster/portmaster Tue Sep 6 03:17:11 2011 (r225412) @@ -748,7 +748,8 @@ unset -f packages_init cross_idx test_co # Update based on options chosen above if [ "$$" -eq "$PM_PARENT_PID" ]; then # Continue error checking in parent only - [ -n "$PM_URB" -a -n "$1" ] && fail 'The -r option is not compatible with other updates' + [ -n "$PM_URB" -o -n "$UPDATE_ALL" ] && [ -n "$1" ] && + fail 'The -[ar] options are not compatible with other updates' if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then [ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109060317.p863HB1e065880>