Author: lslezak Date: Fri Jul 29 15:23:44 2011 New Revision: 65086 URL: http://svn.opensuse.org/viewcvs/yast?rev=65086&view=rev Log: - do not disable current repositories, minimal migration uses "DUP from" feature so they can stay enabled (bnc#708632) - adapted help texts 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 branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.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=65086&r1=65085&r2=65086&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 Fri Jul 29 15:23:44 2011 @@ -3,6 +3,8 @@ - display solver error in the migration propsal, do not allow starting migration when there is an unsolved problem (bnc#708676) +- do not disable current repositories, minimal migration uses + "DUP from" feature so they can stay enabled (bnc#708632) ------------------------------------------------------------------- Thu Jul 28 11:56:48 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=65086&r1=65085&r2=65086&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 Fri Jul 29 15:23:44 2011 @@ -166,9 +166,9 @@ `RadioButtonGroup(`id(`migration_type), `VBox( // radio button - `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), !full)), + `Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"), full)) + `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full)) ) ) ) @@ -184,7 +184,9 @@ // help text string help_text = "<p>" + _("Select the requested migration type.") // help text - + "</p><p>" + _("Minimal migration migrates only minimal set of packages (the core packages providing basic system functionality), full migration migrates all installed packages.") + "</p>"; + + "</p><p>" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest version available in any enabled repository. Full migration might use third party repositories.") + // help text + + "</p><p>" + _("Press <b>Advanced</b> button to manually select the repositories used for upgrading.") + "</p>"; Wizard::SetContents (heading_text, contents, help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp?rev=65086&r1=65085&r2=65086&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp Fri Jul 29 15:23:44 2011 @@ -290,9 +290,6 @@ ResetPackager(); - // Remembers all repositories that will be disabled later (after registration run) - FindOldRepositoriesToBeDisabled(); - y2milestone ("Returning: %1", ret); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org