Author: lslezak
Date: Mon Aug 1 14:06:02 2011
New Revision: 65108
URL: http://svn.opensuse.org/viewcvs/yast?rev=65108&view=rev
Log:
merged changes from SP branch
Modified:
trunk/wagon/ (props changed)
trunk/wagon/VERSION
trunk/wagon/package/yast2-wagon.changes
trunk/wagon/src/clients/wagon_dup_repositories.ycp
trunk/wagon/src/clients/wagon_migration_products.ycp
trunk/wagon/src/clients/wagon_registration_check.ycp
trunk/wagon/src/config/cd_update.desktop (props changed)
trunk/wagon/src/include/common_func.ycp
trunk/wagon/src/modules/Wagon.ycp (contents, props changed)
Modified: trunk/wagon/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=65108&r1=65107&r2=65108&view=diff
==============================================================================
--- trunk/wagon/VERSION (original)
+++ trunk/wagon/VERSION Mon Aug 1 14:06:02 2011
@@ -1 +1 @@
-2.21.3
+2.21.4
Modified: trunk/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=65108&r1=65107&r2=65108&view=diff
==============================================================================
--- trunk/wagon/package/yast2-wagon.changes (original)
+++ trunk/wagon/package/yast2-wagon.changes Mon Aug 1 14:06:02 2011
@@ -1,4 +1,27 @@
-------------------------------------------------------------------
+Mon Aug 1 11:40:57 UTC 2011 - lslezak@suse.cz
+
+- 2.21.4
+
+-------------------------------------------------------------------
+Fri Jul 29 07:12:14 UTC 2011 - lslezak@suse.cz
+
+- 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
+
+- fixed registration status check when registering against SMT
+ (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
- added new core/full migration selection dialog
Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repositories.ycp?rev=65108&r1=65107&r2=65108&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original)
+++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Mon Aug 1 14:06:02 2011
@@ -22,6 +22,7 @@
import "Wizard";
import "Popup";
+ include "wagon/common_func.ycp";
define list TableContent()
{
@@ -154,6 +155,8 @@
{
// heading text
string heading_text = _("Migration Type");
+ // full migration?
+ boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true));
term contents = `VBox(
// frame label
@@ -163,9 +166,9 @@
`RadioButtonGroup(`id(`migration_type),
`VBox(
// radio button
- `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)),
+ `Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)),
// radio button
- `Left(`RadioButton(`id(`full), _("&Full migration (all packages)")))
+ `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full))
)
)
)
@@ -181,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());
@@ -193,8 +198,12 @@
symbol ret = nil;
+ list<integer> prev_dup_repos = Wagon::DupRepos();
+ boolean prev_manual_selection = Wagon::ManualRepoSelection();
+
while (true) {
- ret = (symbol)UI::UserInput();
+ // go to advanced config it was used previously
+ ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput();
if (ret == `next)
{
@@ -207,6 +216,7 @@
// DUP: all repositories
y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true)));
Wagon::SetDupRepos(Pkg::SourceGetCurrent(true));
+ Wagon::SetManualRepoSelection(false);
}
else if (mtype == `minimal)
{
@@ -229,6 +239,7 @@
y2milestone("Converted aliases to ids: %1", added_repos);
Wagon::SetDupRepos(added_repos);
+ Wagon::SetManualRepoSelection(false);
}
else
{
@@ -255,14 +266,20 @@
y2milestone("Manual DUP repository selection selected");
ret = DupSelectionDialog();
- if (ret == `abort || ret == `close || ret == `next)
+ if (ret == `abort || ret == `close)
+ {
+ break;
+ }
+ else if (ret == `next)
{
+ Wagon::SetManualRepoSelection(true);
break;
}
else if (ret == `back)
{
// refresh the dialog
SetMigrationSelectionDialogContent();
+ Wagon::SetManualRepoSelection(false);
}
else
{
@@ -275,6 +292,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;
}
Modified: trunk/wagon/src/clients/wagon_migration_products.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migration_products.ycp?rev=65108&r1=65107&r2=65108&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_migration_products.ycp (original)
+++ trunk/wagon/src/clients/wagon_migration_products.ycp Mon Aug 1 14:06:02 2011
@@ -290,9 +290,6 @@
ResetPackager();
- // Remembers all repositories that will be disabled later (after registration run)
- FindOldRepositoriesToBeDisabled();
-
y2milestone ("Returning: %1", ret);
return ret;
Modified: trunk/wagon/src/clients/wagon_registration_check.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registration_check.ycp?rev=65108&r1=65107&r2=65108&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_registration_check.ycp (original)
+++ trunk/wagon/src/clients/wagon_registration_check.ycp Mon Aug 1 14:06:02 2011
@@ -232,6 +232,14 @@
// some other problem and user has to be informed about it
define boolean Interactive(map