Author: lslezak Date: Thu Jul 28 22:50:40 2011 New Revision: 65081 URL: http://svn.opensuse.org/viewcvs/yast?rev=65081&view=rev Log: - reset and repropose package selection when migration type is changed (bnc#708641) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes?rev=65081&r1=65080&r2=65081&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 22:50:40 2011 @@ -5,6 +5,8 @@ (bnc#708888) - properly display selected migration type when going back in the migration workflow (bnc#708667) +- reset and repropose package selection when migration type is + changed (bnc#708641) ------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak@suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp?rev=65081&r1=65080&r2=65081&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Thu Jul 28 22:50:40 2011 @@ -22,6 +22,7 @@ import "Wizard"; import "Popup"; + include "wagon/common_func.ycp"; define list TableContent() { @@ -195,6 +196,9 @@ symbol ret = nil; + list<integer> prev_dup_repos = Wagon::DupRepos(); + boolean prev_manual_selection = Wagon::ManualRepoSelection(); + while (true) { // go to advanced config it was used previously ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); @@ -286,6 +290,15 @@ } } + if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection())) + { + y2milestone("DUP repository config has been changed, repropose package selection"); + Wagon::ResetDUPProposal(); + + // reset current package selection + ResetPackager(); + } + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org