Author: dmacvicar Date: Tue Aug 28 18:51:24 2007 New Revision: 6940 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6940&view=rev Log: dont show report bug on abort Modified: trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=6940&r1=6939&r2=6940&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Aug 28 18:51:24 2007 @@ -21,6 +21,7 @@ #include #include +#include "zypp/base/UserRequestException.h" #include #include @@ -1427,6 +1428,13 @@ 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 @@ cerr << ex.asUserString() << endl; report_a_bug(cerr); } - if ( gSettings.machine_readable ) cout << "</stream>" << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org