Author: locilka
Date: Tue Feb 17 13:31:05 2009
New Revision: 55544
URL: http://svn.opensuse.org/viewcvs/yast?rev=55544&view=rev
Log:
- Installed products are not directly connected with their add-on
repositories. Merging them together and removing both add-on
product and repository when removing an add-on (bnc #475591).
- 2.17.19
Modified:
branches/SuSE-Code-11-Branch/add-on/VERSION
branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes
branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp
Modified: branches/SuSE-Code-11-Branch/add-on/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VERSION?rev=55544&r1=55543&r2=55544&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/add-on/VERSION (original)
+++ branches/SuSE-Code-11-Branch/add-on/VERSION Tue Feb 17 13:31:05 2009
@@ -1 +1 @@
-2.17.18
+2.17.19
Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes?rev=55544&r1=55543&r2=55544&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original)
+++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Tue Feb 17 13:31:05 2009
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Feb 17 13:26:27 CET 2009 - locilka@suse.cz
+
+- Installed products are not directly connected with their add-on
+ repositories. Merging them together and removing both add-on
+ product and repository when removing an add-on (bnc #475591).
+- 2.17.19
+
+-------------------------------------------------------------------
Wed Feb 11 19:10:33 CET 2009 - locilka@suse.cz
- Selecting all products available on add-on media for installation
Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp?rev=55544&r1=55543&r2=55544&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original)
+++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Tue Feb 17 13:31:05 2009
@@ -1244,10 +1244,14 @@
),
sformat (
_("<b>Repository URL:</b> %1<br>"),
- pi["repository","url"]:_("Unknown repository URL")
+ (size (pi["info","URLs"]:[]) > 0 ?
+ mergestring (pi["info","URLs"]:[], ",")
+ :
+ _("Unknown repository URL")
+ )
),
- (pi["repository","url"]:"" != pi["repository","alias"]:"" ?
- sformat (_("<b>Repository Alias:</b> %1<br>"), pi["repository","alias"]:"")
+ (size (pi["info","aliases"]:[]) > 0 ?
+ sformat (_("<b>Repository Alias:</b> %1<br>"), mergestring (pi["info","aliases"]:[], ","))
:
""
)
@@ -1266,9 +1270,73 @@
return return_this;
}
+/**
+ * Modifies repository info (adds some missing pieces).
+ */
+void AdjustRepositoryInfo (map & info) {
+ foreach (integer one_repo, (list <integer>) info["IDs"]:[], {
+ if (one_repo == nil || one_repo == -1) {
+ y2warning ("Wrong repo ID: %1", one_repo);
+ return;
+ }
+
+ map source_data = Pkg::SourceGeneralData (one_repo);
+
+ if (source_data != nil && haskey (source_data, "base_urls")) {
+ info["URLs"] = source_data["base_urls"]:[];
+ } else {
+ y2error ("No URLs for repo ID %1", one_repo);
+ }
+
+ if (source_data != nil && haskey (source_data, "alias")) {
+ info["aliases"] = [source_data["alias"]:""];
+ }
+ });
+}
+
+/**
+ * @struct $[
+ * "IDs" : [8, 9, 12],
+ * "URLs" : ["dvd://", "http://some/URL/", "ftp://another/URL/"],
+ * "aliases" : ["alias1", "alias2", "alias3"],
+ * ]
+ */
+map GetRepoInfo (map & this_product, list