From 8747495854d863f85f920ae79e3a787571149814 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Mon, 14 Nov 2011 15:35:22 +0100 Subject: [PATCH] Never evaluate package support status on openSUSE (bnc#715057) --- package/zypper.changes | 5 +++++ src/solve-commit.cc | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index b37045d..569141d 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 14 15:31:37 CET 2011 - ma@suse.de + +- Never evaluate package support status on openSUSE (bnc#715057) + +------------------------------------------------------------------- Sun Nov 13 01:13:19 CET 2011 - ma@suse.de - Update zypper-po.tar.bz2 diff --git a/src/solve-commit.cc b/src/solve-commit.cc index cd0866b..9ace6f0 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -559,6 +559,11 @@ void solve_and_commit (Zypper & zypper) Summary summary(God->pool()); + if (zypper.out().verbosity() == Out::HIGH) + summary.setViewOption(Summary::SHOW_VERSION); + else if (zypper.out().verbosity() == Out::DEBUG) + summary.setViewOption(Summary::SHOW_ALL); + // show not updated packages if 'zypper up' (-t package or -t product) ResKindSet kinds; if (zypper.cOpts().find("type") != zypper.cOpts().end()) @@ -576,11 +581,8 @@ void solve_and_commit (Zypper & zypper) Product::constPtr platform = God->target()->baseProduct(); if (platform && platform->name().find("SUSE_SLE") != string::npos) summary.setViewOption(Summary::SHOW_UNSUPPORTED); - - if (zypper.out().verbosity() == Out::HIGH) - summary.setViewOption(Summary::SHOW_VERSION); - else if (zypper.out().verbosity() == Out::DEBUG) - summary.setViewOption(Summary::SHOW_ALL); + else + summary.unsetViewOption(Summary::SHOW_UNSUPPORTED); summary.setShowRepoAlias(zypper.config().show_alias); -- 2.7.4