From 82e1a54a91a8628f6882e7073605250bb7cbcbb2 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Tue, 31 May 2011 12:14:45 +0200 Subject: [PATCH] do some code-cleanup --- src/SolverRequester.cc | 3 ++- src/info.cc | 3 ++- src/update.cc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/SolverRequester.cc b/src/SolverRequester.cc index 15907b8..a5de91c 100644 --- a/src/SolverRequester.cc +++ b/src/SolverRequester.cc @@ -400,7 +400,8 @@ bool SolverRequester::installPatch( if (ignore_pkgmgmt || patch->restartSuggested()) { Patch::InteractiveFlags ignoreFlags = Patch::NoFlags; - ignoreFlags |= (Zypper::instance()->globalOpts().reboot_req_non_interactive) ? Patch::Reboot : Patch::NoFlags; + if (Zypper::instance()->globalOpts().reboot_req_non_interactive) + ignoreFlags |= Patch::Reboot; // bnc #221476 if (_opts.skip_interactive && patch->interactiveWhenIgnoring(ignoreFlags)) diff --git a/src/info.cc b/src/info.cc index f3e1f02..f0c017e 100644 --- a/src/info.cc +++ b/src/info.cc @@ -268,7 +268,8 @@ void printPatchInfo(Zypper & zypper, const ui::Selectable & s ) cout << (patch->restartSuggested() ? _("Yes") : _("No")) << endl; Patch::InteractiveFlags ignoreFlags = Patch::NoFlags; - ignoreFlags |= (zypper.globalOpts().reboot_req_non_interactive) ? Patch::Reboot : Patch::NoFlags; + if (zypper.globalOpts().reboot_req_non_interactive) + ignoreFlags |= Patch::Reboot; cout << _("Interactive: ") << (patch->interactiveWhenIgnoring(ignoreFlags) ? _("Yes") : _("No")) << endl; diff --git a/src/update.cc b/src/update.cc index 041c05d..ff160ed 100755 --- a/src/update.cc +++ b/src/update.cc @@ -140,7 +140,8 @@ static bool xml_list_patches (Zypper & zypper) cout << "restart=\"" << (patch->rebootSuggested() ? "true" : "false") << "\" "; Patch::InteractiveFlags ignoreFlags = Patch::NoFlags; - ignoreFlags |= (zypper.globalOpts().reboot_req_non_interactive) ? Patch::Reboot : Patch::NoFlags; + if (zypper.globalOpts().reboot_req_non_interactive) + ignoreFlags |= Patch::Reboot; cout << "interactive=\"" << (patch->interactiveWhenIgnoring(ignoreFlags) ? "true" : "false") << "\" "; cout << "kind=\"patch\""; -- 2.7.4