Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Fri Apr 30 01:35:04 CEST 2010.
--------
--- yast2-product-creator/yast2-product-creator.changes 2010-04-28 16:57:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2010-04-29 18:03:54.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Apr 29 18:02:40 CEST 2010 - jsuchome@suse.cz
+
+- remember the directory of the saved configuration (bnc#600922)
+- 2.19.10
+
+-------------------------------------------------------------------
+Thu Apr 29 13:24:34 CEST 2010 - jsuchome@suse.cz
+
+- check availability of selected packages and report problem
+ (bnc#599952)
+- 2.19.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.19.8.tar.bz2
New:
----
yast2-product-creator-2.19.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.COSWbC/_old 2010-04-30 01:35:00.000000000 +0200
+++ /var/tmp/diff_new_pack.COSWbC/_new 2010-04-30 01:35:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.19.8)
+# spec file for package yast2-product-creator (Version 2.19.10)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.19.8
+Version: 2.19.10
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.19.8.tar.bz2
+Source0: yast2-product-creator-2.19.10.tar.bz2
Prefix: /usr
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.19.8
+%setup -n yast2-product-creator-2.19.10
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.19.8.tar.bz2 -> yast2-product-creator-2.19.10.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/VERSION new/yast2-product-creator-2.19.10/VERSION
--- old/yast2-product-creator-2.19.8/VERSION 2010-04-28 16:56:14.000000000 +0200
+++ new/yast2-product-creator-2.19.10/VERSION 2010-04-29 18:03:16.000000000 +0200
@@ -1 +1 @@
-2.19.8
+2.19.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/src/Kiwi.ycp new/yast2-product-creator-2.19.10/src/Kiwi.ycp
--- old/yast2-product-creator-2.19.8/src/Kiwi.ycp 2010-04-28 16:05:26.000000000 +0200
+++ new/yast2-product-creator-2.19.10/src/Kiwi.ycp 2010-04-29 18:02:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel
*
- * $Id: Kiwi.ycp 61261 2010-03-11 10:11:33Z jsuchome $
+ * $Id: Kiwi.ycp 61899 2010-04-28 14:56:41Z jsuchome $
*/
{
module "Kiwi";
@@ -352,7 +352,7 @@
%2</image>", image_tag, image_contents);
- config_dir = tmp_dir + "/" + KiwiConfig["name"]:"";
+ config_dir = tmp_dir + "/" + KiwiConfig["original_directory"]:KiwiConfig["name"]:"";
SCR::Execute (.target.mkdir, config_dir);
SCR::Write (.target.string, config_dir + "/config.xml", write_string);
// config.xml may contain password, do not let other users read it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/src/complex.ycp new/yast2-product-creator-2.19.10/src/complex.ycp
--- old/yast2-product-creator-2.19.8/src/complex.ycp 2009-12-22 15:49:36.000000000 +0100
+++ new/yast2-product-creator-2.19.10/src/complex.ycp 2010-04-29 18:02:19.000000000 +0200
@@ -682,6 +682,7 @@
}
string task = get_current_task (config);
+ config["original_directory"] = d;
config["kiwi_configuration_" + task] = images_dir + "/" + d;
config["current_task"] = task;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.8/src/kiwi_dialogs.ycp new/yast2-product-creator-2.19.10/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.19.8/src/kiwi_dialogs.ycp 2010-02-26 16:34:11.000000000 +0100
+++ new/yast2-product-creator-2.19.10/src/kiwi_dialogs.ycp 2010-04-29 18:02:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 61052 2010-02-26 15:33:41Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 61911 2010-04-29 11:26:01Z jsuchome $
*/
{
textdomain "product-creator";
@@ -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 () {
+
+ Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait..."));
+ 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);
+ }
+ }
+ });
+ Popup::ClearFeedback ();
+ return true;
+}
+
/**
* Main dialog for Kiwi image configuration
*/
@@ -1865,6 +1903,8 @@
InitImageConfiguration ();
+CheckForAvailablePackages ();
+
map widget_descr = get_widget_description ();
widget_descr["tab"] = CWMTab::CreateWidget($[
"tab_order" : [
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org