Author: jsuchome
Date: Thu Apr 29 13:26:01 2010
New Revision: 61911
URL: http://svn.opensuse.org/viewcvs/yast?rev=61911&view=rev
Log:
- check availability of selected packages and report problem
(bnc#599952)
- 2.19.9
Modified:
trunk/product-creator/VERSION
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/kiwi_dialogs.ycp
Modified: trunk/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=61911&r1=61910&r2=61911&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Thu Apr 29 13:26:01 2010
@@ -1 +1 @@
-2.19.8
+2.19.9
Modified: trunk/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=61911&r1=61910&r2=61911&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Thu Apr 29 13:26:01 2010
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Apr 29 13:24:34 CEST 2010 - jsuchome@suse.cz
+
+- check availability of selected packages and report problem
+ (bnc#599952)
+- 2.19.9
+
+-------------------------------------------------------------------
Wed Apr 28 16:55:50 CEST 2010 - jsuchome@suse.cz
- better check for URLs of local repositories, so local repository
Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=61911&r1=61910&r2=61911&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Thu Apr 29 13:26:01 2010
@@ -40,6 +40,12 @@
string content_key = Kiwi::content_key;
+ map section_type_label = $[
+ "image" : _("Packages for Image"),
+ "bootstrap" : _("Bootstrap"),
+ "xen" : _("Xen Specific Packages")
+ ];
+
// read available the images under /usr/share/kiwi/image/ directory
list<term> GetAvailableImages (string subdir) {
@@ -1858,6 +1864,38 @@
];
}
+/**
+ * Check if selected packages are available (some of them may not after
+ * deleting some repository)
+ */
+define boolean CheckForAvailablePackages () {
+
+ UI::BusyCursor ();
+ foreach (map pmap, KiwiConfig["packages"]:[], {
+ string type = pmap["type"]:"";
+ if (type != "delete")
+ {
+ list<string> n_a = [];
+ foreach (map p, pmap["package"]:[], {
+ if (p["name"]:"" != "" && !Package::Available (p["name"]:""))
+ n_a = add (n_a, p["name"]:"");
+ });
+ if (size (n_a) > 0)
+ {
+ string type_label = section_type_label[type]:type;
+ // popup headline
+ Popup::LongText (_("Missing packages"),
+ // popup text
+ `RichText (sformat (_("<p>These packages from section '%1' are not available with selected repositories:</p>
+<p>%2.</p>
+<p>Check the list of packages and package repositories.</p>"), type_label, mergestring (sort (n_a), "<br>"))), 70, 25);
+ }
+ }
+ });
+ UI::NormalCursor ();
+ return true;
+}
+
/**
* Main dialog for Kiwi image configuration
*/
@@ -1865,6 +1903,8 @@
InitImageConfiguration ();
+CheckForAvailablePackages ();
+
map