Author: lslezak Date: Tue May 22 16:51:52 2007 New Revision: 38090 URL: http://svn.opensuse.org/viewcvs/yast?rev=38090&view=rev Log: - run the package selector when there is an unresolved dependency when creating installation ISO Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp branches/tmp/lslezak/cd-creator/src/complex.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes?rev=38090&r1=38089&r2=38090&view=diff ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Tue May 22 16:51:52 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 16:49:28 CEST 2007 - lslezak@suse.cz + +- run the package selector when there is an unresolved dependency + when creating installation ISO + +------------------------------------------------------------------- Tue May 22 14:05:39 CEST 2007 - lslezak@suse.cz - escape XML entities in URL when writing the config file Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp?rev=38090&r1=38089&r2=38090&view=diff ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Tue May 22 16:51:52 2007 @@ -1970,7 +1970,7 @@ Progress::Title(_("Checking for package availability...")); list<string> selectedPackages = Pkg::GetPackages (`selected , true); - y2milestone("Selected %1 packages", size(selectedPackages)); + y2milestone("Selected %1 packages: %2", size(selectedPackages), sort(selectedPackages)); list<string> failed = []; toCopy = $[]; Modified: branches/tmp/lslezak/cd-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/complex.ycp?rev=38090&r1=38089&r2=38090&view=diff ============================================================================== --- branches/tmp/lslezak/cd-creator/src/complex.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/complex.ycp Tue May 22 16:51:52 2007 @@ -24,7 +24,7 @@ import "CommandLine"; include "product-creator/helps.ycp"; - //include "product-creator/routines.ycp"; + include "product-creator/dialogs.ycp"; /** * Return a modification status @@ -464,6 +464,15 @@ CommandLine::PrintVerbose(_("Selecting packages...")); success = ProductCreator::setPackages(); + if (!success) + { + // set a fake root mount point - there is no use to display DU of the current system + Pkg::TargetInitDU([ $[ "name" : "/", "free" : 999*1024*1024 /* 999GB */, "used" : 0, "readonly" : false ] ]); + + // the solver has failed, let the user resolve the dependencies + detailedSelection(nil); + } + Progress::NextStage(); CommandLine::PrintVerbose(_("Checking packages...")); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org