Author: jkupec Date: Tue Apr 1 12:24:45 2008 New Revision: 9323 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9323&view=rev Log: - don't force resolution on dist-upgrade (#369980) 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=932... ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Apr 1 12:24:45 2008 @@ -1076,8 +1076,9 @@ // and not rug_compatible mode if (indeterminate(force_resolution)) { - if (zypper.globalOpts().non_interactive && - !zypper.globalOpts().is_rug_compatible) + if ((zypper.globalOpts().non_interactive && + !zypper.globalOpts().is_rug_compatible) || + zypper.command() == ZypperCommand::DIST_UPGRADE) // bnc #369980 force_resolution = false; else force_resolution = true; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org