Author: jreidinger Date: Tue Mar 18 11:52:00 2008 New Revision: 9190 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9190&view=rev Log: add abort/retry/ignore option when download fail (bnc #340345) Modified: trunk/zypper/src/zypper-media-callbacks.h Modified: trunk/zypper/src/zypper-media-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callbacks.h?rev=9190&r1=9189&r2=9190&view=diff ============================================================================== --- trunk/zypper/src/zypper-media-callbacks.h (original) +++ trunk/zypper/src/zypper-media-callbacks.h Tue Mar 18 11:52:00 2008 @@ -47,10 +47,10 @@ it != devices.end(); ++it) std::cout << *it << " "; cout << std::endl;*/ - if (is_changeable_media(url)) + Zypper::instance()->out().error(description); + if (is_changeable_media(url) && error == MediaChangeReport::WRONG) { //cerr << endl; // may be in the middle of RepoReport or ProgressReport \todo check this - Zypper::instance()->out().error(description); std::string request = boost::str(boost::format( // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language. @@ -65,9 +65,8 @@ return MediaChangeReport::ABORT; } - // not displaying the error for non-changeable media, it will be displayed - // where it is caught - return MediaChangeReport::ABORT; + return (Action) read_action_ari(PROMPT_ARI_MEDIA_PROBLEM + ,MediaChangeReport::ABORT); } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org