Author: lslezak
Date: Fri Oct 3 12:47:52 2008
New Revision: 51830
URL: http://svn.opensuse.org/viewcvs/yast?rev=51830&view=rev
Log:
- repositories.ycp - fixed saving modified services
Modified:
trunk/packager/src/clients/repositories.ycp
trunk/packager/src/include/repositories_include.ycp
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=51830&r1=51829&r2=51830&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Fri Oct 3 12:47:52 2008
@@ -260,7 +260,10 @@
void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name)
{
map info = repo_mode ? getSourceInfo (index, source) : source;
- y2milestone("getSourceInfo(%1, %2): %3", index, source, info);
+ if (repo_mode)
+ {
+ y2milestone("getSourceInfo(%1, %2): %3", index, source, info);
+ }
// heading - in case repo name not found
string name = info["name"]:_("Unknown repository name");
@@ -381,15 +384,22 @@
y2milestone ("Services from %1 To %2", statesOld, statesNew);
list<string> ret = [];
- map seen = listmap (
+ list<string> seen = maplist (
map srv, statesOld,
- ``( $[(srv["alias"]:"") : (srv["enabled"]:true) ] ));
+ {
+ return srv["alias"]:"";
+ }
+ );
foreach (map srv, statesNew, {
string alias = srv["alias"]:"";
- boolean newena = srv["enabled"]:true;
- if (newena && ! seen[alias]:false)
+
+ y2internal("Checking %1", alias);
+
+ if (!contains(seen, alias))
+ {
ret = add (ret, alias);
+ }
});
y2milestone ("Difference %1", ret);
return ret;
@@ -459,14 +469,47 @@
}
);
- // evaluate removed services
-/*
- foreach(integer id, servicesToDelete,
+ // evaluate removed and new services
+ list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn);
+ y2milestone("Deleted services: %1", deleted_services);
+ list<string> added_services = newServices(serviceStatesIn, serviceStatesOut);
+ y2milestone("Added services: %1", added_services);
+
+ foreach(string alias, deleted_services,
+ {
+ y2milestone("Removing service %1", alias);
+ success = success && Pkg::ServiceDelete(alias);
+ }
+ );
+
+ foreach(map s, serviceStatesOut,
{
- success = success && Pkg::ServiceDelete(id);
+ string alias = s["alias"]:"";
+
+ if (contains(added_services, alias))
+ {
+ y2milestone("Adding service %1", alias);
+ string new_url = s["url"]:"";
+
+ if (new_url != "")
+ {
+ y2internal("aliases: %1", Pkg::ServiceAliases());
+ success = success && Pkg::ServiceAdd(alias, new_url);
+ // set enabled and autorefresh flags
+ success = success && Pkg::ServiceSet(alias, s);
+ }
+ else
+ {
+ y2error("Empty URL for service %1", alias);
+ }
+ }
+ else
+ {
+ y2milestone("Modifying service %1", alias);
+ success = success && Pkg::ServiceSet(alias, s);
+ }
}
);
-*/
success = success && KeyManager::Write();
@@ -1236,7 +1279,7 @@
y2error("Ignoring event `priority: the widget should NOT be displayed in service mode!");
}
}
- else
+ else if (input != `table)
{
y2warning("Unknown user input: %1", input);
}
Modified: trunk/packager/src/include/repositories_include.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositories_include.ycp?rev=51830&r1=51829&r2=51830&view=diff
==============================================================================
--- trunk/packager/src/include/repositories_include.ycp (original)
+++ trunk/packager/src/include/repositories_include.ycp Fri Oct 3 12:47:52 2008
@@ -83,8 +83,6 @@
idx = idx + 1;
}
- Pkg::ServiceAdd(alias, url);
-
boolean autorefresh = true;
string schema = tolower(substring(url, 0, 3));
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
