From: Dominik Heidler Date: Wed, 25 May 2011 08:21:51 +0000 (+0200) Subject: rename an option X-Git-Tag: 1.6.7~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00f9d7dcd06bd63020f92fe50b7e81ad52cf39a8;p=platform%2Fupstream%2Fzypper.git rename an option old: --reboot-not-interact new: --non-interactive-include-reboot-patches --- diff --git a/src/Zypper.cc b/src/Zypper.cc index 248ce14..316fb9f 100644 --- a/src/Zypper.cc +++ b/src/Zypper.cc @@ -164,7 +164,8 @@ void print_main_help(Zypper & zypper) "\t--rug-compatible, -r\tTurn on rug compatibility.\n" "\t--non-interactive, -n\tDo not ask anything, use default answers\n" "\t\t\t\tautomatically.\n" - "\t--reboot-not-interact\tDo not treat patches as interactive, which have\n" + "\t--non-interactive-include-reboot-patches\n" + "\t\t\t\tDo not treat patches as interactive, which have\n" "\t\t\t\tthe rebootSuggested-flag set.\n" "\t--xmlout, -x\t\tSwitch to XML output.\n" ); @@ -334,7 +335,7 @@ void Zypper::processGlobalOptions() {"table-style", required_argument, 0, 's'}, {"rug-compatible", no_argument, 0, 'r'}, {"non-interactive", no_argument, 0, 'n'}, - {"reboot-not-interact", no_argument, 0, '0'}, + {"non-interactive-include-reboot-patches", no_argument, 0, '0'}, {"no-gpg-checks", no_argument, 0, 0 }, {"gpg-auto-import-keys", no_argument, 0, 0 }, {"root", required_argument, 0, 'R'}, @@ -472,7 +473,7 @@ void Zypper::processGlobalOptions() MIL << "Entering non-interactive mode" << endl; } - if (gopts.count("reboot-not-interact")) { + if (gopts.count("non-interactive-include-reboot-patches")) { _gopts.reboot_req_non_interactive = true; out().info(_("Patches having the flag rebootSuggested set will not be treated as interactive."), Out::HIGH); MIL << "Patches having the flag rebootSuggested set will not be treated as interactive" << endl;