Author: locilka
Date: Wed Jan 27 12:06:50 2010
New Revision: 60546
URL: http://svn.opensuse.org/viewcvs/yast?rev=60546&view=rev
Log:
- Disabling repositories that provide some old version of product
to be upgraded (BNC #573092).
- Fixed RPM dependencies.
- 2.17.8.2
Added:
branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_modify_repositories.ycp
Modified:
branches/SuSE-Code-11-Branch/wagon/VERSION
branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes
branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp
branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp
branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml
branches/SuSE-Code-11-Branch/wagon/src/include/common_func.ycp
branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp
branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in
Modified: branches/SuSE-Code-11-Branch/wagon/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VERSION?rev=60546&r1=60545&r2=60546&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/wagon/VERSION (original)
+++ branches/SuSE-Code-11-Branch/wagon/VERSION Wed Jan 27 12:06:50 2010
@@ -1 +1 @@
-2.17.8.1
+2.17.8.2
Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes?rev=60546&r1=60545&r2=60546&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original)
+++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Wed Jan 27 12:06:50 2010
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Jan 27 11:52:01 CET 2010 - locilka@suse.cz
+
+- Disabling repositories that provide some old version of product
+ to be upgraded (BNC #573092).
+- Fixed RPM dependencies.
+- 2.17.8.2
+
+-------------------------------------------------------------------
Tue Jan 26 15:13:12 CET 2010 - locilka@suse.cz
- Added support for migration hook scripts.
Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp?rev=60546&r1=60545&r2=60546&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp (original)
+++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon.ycp Wed Jan 27 12:06:50 2010
@@ -206,6 +206,24 @@
false, true
);
+ y2milestone ("Repositories disabled by migration: %1", Wagon::disabled_repositories);
+ foreach (string repo_alias, Wagon::disabled_repositories, {
+ integer repo_id = FindRepoIdByAlias (repo_alias);
+
+ if (repo_id == nil) {
+ y2error ("Cannot enable repo (alias)%1, repo not found ", repo_alias);
+ Report::Error (sformat(_("Cannot enable repository with alias
+%1
+Repository was not found."), repo_alias));
+ return;
+ }
+
+ y2milestone ("Enabling repository %1 returned: %2", repo_id, Pkg::SourceSetEnabled (repo_id, true));
+ });
+
+ Pkg::SourceSaveAll();
+ Wagon::InitPkg();
+
// Remove all the migration products using packages approach manually
// Removing via ResolvableRemove + PkgSolve usually produces errors,
// dependency loops etc.
Modified: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp?rev=60546&r1=60545&r2=60546&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp (original)
+++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_migration_products.ycp Wed Jan 27 12:06:50 2010
@@ -135,6 +135,77 @@
return true;
}
+ /**
+ * Finds all products that contain information about their migration product
+ * finds which repositories provide these products and disables the
+ * repositories.
+ *
+ * @see BNC #573092
+ */
+ boolean FindOldRepositoriesToBeDisabled () {
+ if (Wagon::InitPkg() != true) {
+ Report::Error (_("Unable to initialize the package manager."));
+ return false;
+ }
+
+ list