Author: lslezak
Date: Tue Dec 16 15:37:27 2008
New Revision: 54185
URL: http://svn.opensuse.org/viewcvs/yast?rev=54185&view=rev
Log:
- do not remove repositories belonging to an already removed
service (service removal failed) (bnc#459413)
Modified:
trunk/packager/VERSION
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/repositories.ycp
Modified: trunk/packager/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=54185&r1=54184&r2=54185&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Tue Dec 16 15:37:27 2008
@@ -1 +1 @@
-2.17.52
+2.18.0
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=54185&r1=54184&r2=54185&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Tue Dec 16 15:37:27 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Dec 16 15:14:41 CET 2008 - lslezak@suse.cz
+
+- do not remove repositories belonging to an already removed
+ service (service removal failed) (bnc#459413)
+
+-------------------------------------------------------------------
Tue Dec 16 14:28:42 CET 2008 - locilka@suse.cz
- Fixed progress when adding community repositories (bnc #459391).
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=54185&r1=54184&r2=54185&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Tue Dec 16 15:37:27 2008
@@ -57,6 +57,7 @@
list<integer> sourcesToDelete = [];
+ list<integer> reposFromDeletedServices = [];
// Do not sync the changes to ZENworks even if rug is present
// This is handy for repairing an already out-of-sync situation
@@ -520,7 +521,14 @@
}
foreach( integer id, sourcesToDelete, ``{
- success = success && Pkg::SourceDelete(id);
+ if (contains(reposFromDeletedServices, id))
+ {
+ y2milestone("Repository %1 has been already removed (belongs to a deleted service)", id);
+ }
+ else
+ {
+ success = success && Pkg::SourceDelete(id);
+ }
});
foreach(map