Revision: 121486 https://trac.macports.org/changeset/121486 Author: cal@macports.org Date: 2014-06-26 14:44:50 -0700 (Thu, 26 Jun 2014) Log Message: ----------- Merge r121485 from trunk: base: port/port.tcl: Fix a problem caused by a flag that didn't get reset in batch mode, closes #44091 Revision Links: -------------- https://trac.macports.org/changeset/121485 Modified Paths: -------------- branches/release_2_3/base/src/port/port.tcl Property Changed: ---------------- branches/release_2_3/base/ Property changes on: branches/release_2_3/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_3/base/src/port/port.tcl =================================================================== --- branches/release_2_3/base/src/port/port.tcl 2014-06-26 21:43:03 UTC (rev 121485) +++ branches/release_2_3/base/src/port/port.tcl 2014-06-26 21:44:50 UTC (rev 121486) @@ -4600,6 +4600,16 @@ # What kind of arguments does the command expect? set expand [action_needs_portlist $action] + # (Re-)initialize private_options(ports_no_args) to no, because it might still be yes + # from the last command in batch mode. If we don't do this, port will fail to + # distinguish arguments that expand to empty lists from no arguments at all: + # > installed + # > list outdated + # will then behave like + # > list + # if outdated expands to the empty list. See #44091, which was filed about this. + set private_options(ports_no_args) "no" + # Parse action arguments, setting a special flag if there were none # We otherwise can't tell the difference between arguments that evaluate # to the empty set, and the empty set itself. @@ -4607,7 +4617,7 @@ switch -- [lookahead] { ; - _EOF_ { - set private_options(ports_no_args) yes + set private_options(ports_no_args) "yes" } default { if {[ACTION_ARGS_NONE] == $expand} {