Author: lslezak
Date: Wed Oct 22 14:33:30 2008
New Revision: 52425
URL: http://svn.opensuse.org/viewcvs/yast?rev=52425&view=rev
Log:
- remove also the repositories which belong to a removed service,
update status of the repositories when the service status is
changed (bnc#437722)
Modified:
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/repositories.ycp
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=52425&r1=52424&r2=52425&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Wed Oct 22 14:33:30 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 22 14:03:47 CEST 2008 - lslezak@suse.cz
+
+- remove also the repositories which belong to a removed service,
+ update status of the repositories when the service status is
+ changed (bnc#437722)
+
+-------------------------------------------------------------------
Tue Oct 21 16:54:31 CEST 2008 - kmachalkova@suse.cz
- AddPackageList from Storage is no longer needed - now y2-storage
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=52425&r1=52424&r2=52425&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Wed Oct 22 14:33:30 2008
@@ -544,7 +544,7 @@
foreach(map srv_state, serviceStatesOut,
{
- term t = `item(`id(srv_state["name"]:""), srv_state["name"]:"");
+ term t = `item(`id(srv_state["alias"]:""), srv_state["name"]:"");
services_t = add(services_t, t);
}
);
@@ -601,6 +601,61 @@
UI::ReplaceWidget(`id(`priorp), repo_mode ? `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority) : `Empty());
}
+void RemoveReposFromService(string service_alias)
+{
+ // delete the repositories belonging to the service
+ list > repos = ReposFromService(service_alias, sourceStatesOut);
+ y2milestone("Removing repos from service alias=%1: %2", service_alias, repos);
+
+ foreach(map repo, repos,
+ {
+ integer srcid = repo["SrcId"]:-1;
+
+ if (srcid != -1) {
+ sourcesToDelete = add (sourcesToDelete, srcid);
+ SourceManager::just_removed_sources = add (SourceManager::just_removed_sources, srcid);
+ }
+
+ sourceStatesOut = filter (map srcstate, sourceStatesOut,
+ {
+ if (srcstate["SrcId"]:-1 == srcid)
+ {
+ y2milestone("Removing repository %1", srcstate);
+ return false;
+ }
+
+ return true;
+ }
+ );
+ }
+ );
+}
+
+void SetReposStatusFromService(string service_alias, boolean enable)
+{
+ // delete the repositories belonging to the service
+ list > repos = ReposFromService(service_alias, sourceStatesOut);
+ y2milestone("%1 repos from service alias=%2: %3", enable ? "Enabling" : "Disabling", service_alias, repos);
+
+ foreach(map repo, repos,
+ {
+ integer srcid = repo["SrcId"]:-1;
+
+ sourceStatesOut = maplist (map srcstate, sourceStatesOut,
+ {
+ if (srcstate["SrcId"]:-1 == srcid)
+ {
+ y2milestone("%1 repository %2", enable ? "Enabling" : "Disabling", srcstate);
+ srcstate["enabled"] = enable;
+ }
+
+ return srcstate;
+ }
+ );
+ }
+ );
+}
+
any SummaryDialog () {
y2milestone ("Running Summary dialog");
@@ -1189,9 +1244,13 @@
}
else
{
+ string selected_service = (serviceStatesOut[current]:$[])["name"]:"";
// yes-no popup
- if ( Popup::YesNo(sformat(_("Delete service %1?"), (serviceStatesOut[current]:$[])["name"]:"")))
+ if ( Popup::YesNo(sformat(_("Delete service %1\nand its repositories?"), selected_service)))
{
+ string service_alias = (serviceStatesOut[current]:$[])["alias"]:"";
+ RemoveReposFromService(service_alias);
+
deleteService( current );
fillTable(repository_view, displayed_service);
fillCurrentRepoInfo();
@@ -1226,6 +1285,10 @@
boolean state = srv["enabled"]:false;
state = !state;
+ // disable/enable the repositories belonging to the service
+ string service_alias = (serviceStatesOut[current]:$[])["alias"]:"";
+ SetReposStatusFromService(service_alias, state);
+
// update the table
string newstate = ( state ? UI::Glyph (`CheckMark) : "");
UI::ChangeWidget( `id( `table ), `Item( current, 0 ), newstate );
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
