From: Duncan Mac-Vicar P Date: Tue, 28 Aug 2007 16:51:24 +0000 (+0000) Subject: dont show report bug on abort X-Git-Tag: BASE-SuSE-Linux-10_3-Branch~86 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faa19455cb83866ee1da95c39f7cbbf2009117c6;p=platform%2Fupstream%2Fzypper.git dont show report bug on abort --- diff --git a/src/zypper.cc b/src/zypper.cc index ded17a5..965c4dd 100644 --- a/src/zypper.cc +++ b/src/zypper.cc @@ -21,6 +21,7 @@ #include #include +#include "zypp/base/UserRequestException.h" #include #include @@ -1427,6 +1428,13 @@ int safe_one_command(int argc, char **argv) ret = one_command (argc, argv); command = ZypperCommand::NONE; } + catch (const AbortRequestException & ex) + { + ZYPP_CAUGHT(ex); + + //cerr << _("User requested to abort.") << endl; + cerr << ex.asUserString() << endl; + } catch (const Exception & ex) { ZYPP_CAUGHT(ex); @@ -1434,7 +1442,6 @@ int safe_one_command(int argc, char **argv) cerr << ex.asUserString() << endl; report_a_bug(cerr); } - if ( gSettings.machine_readable ) cout << "" << endl;