Author: jkupec Date: Sun Apr 13 20:25:28 2008 New Revision: 9593 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9593&view=rev Log: - fix dependency resolution prompt (Cancel didn't cancel if there was more than one problem) Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=9593&r1=9592&r2=9593&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Apr 13 20:25:28 2008 @@ -640,9 +640,12 @@ // retry if (problem_count > 1 && reply == solution_count + 1) return true; - // cancel + // cancel (one problem) if (problem_count == 1 && reply == solution_count) return false; + // cancel (more problems) + if (problem_count > 1 && reply == solution_count + 2) + return false; // skip if (problem_count > 1 && reply == solution_count) return indeterminate; // continue with next problem -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org