Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Thu Aug 9 21:27:05 CEST 2007.
--------
--- yast2-product-creator/yast2-product-creator.changes 2007-08-08 15:42:06.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2007-08-09 15:49:55.258577000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 9 14:42:49 CEST 2007 - jsuchome@suse.cz
+
+- kiwi UI: enable creating config from scratch, with default
+ YaST sources
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.15.2.tar.bz2
New:
----
yast2-product-creator-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.GDB573/_old 2007-08-09 21:26:54.000000000 +0200
+++ /var/tmp/diff_new_pack.GDB573/_new 2007-08-09 21:26:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.15.2)
+# spec file for package yast2-product-creator (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-product-creator
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.15.2.tar.bz2
+Source0: yast2-product-creator-2.15.3.tar.bz2
prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite
Requires: yast2-packager autoyast2-installation yast2-security
@@ -33,7 +33,7 @@
%prep
-%setup -n yast2-product-creator-2.15.2
+%setup -n yast2-product-creator-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,10 @@
/usr/lib/YaST2/servers_non_y2/ag_*
%changelog
+* Thu Aug 09 2007 - jsuchome@suse.cz
+- kiwi UI: enable creating config from scratch, with default
+ YaST sources
+- 2.15.3
* Wed Aug 08 2007 - jsuchome@suse.cz
- yet another fix for "Back" button behavior (#289524)
- enable editing of isolinux.cfg in case of autoYaST usage (#287443)
++++++ yast2-product-creator-2.15.2.tar.bz2 -> yast2-product-creator-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.2/src/complex.ycp new/yast2-product-creator-2.15.3/src/complex.ycp
--- old/yast2-product-creator-2.15.2/src/complex.ycp 2007-08-08 15:35:21.000000000 +0200
+++ new/yast2-product-creator-2.15.3/src/complex.ycp 2007-08-08 15:43:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: complex.ycp 38945 2007-06-21 12:19:17Z jsuchome $
+ * $Id: complex.ycp 40091 2007-08-08 13:43:09Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.2/src/kiwi.desktop new/yast2-product-creator-2.15.3/src/kiwi.desktop
--- old/yast2-product-creator-2.15.2/src/kiwi.desktop 2007-08-03 17:08:39.000000000 +0200
+++ new/yast2-product-creator-2.15.3/src/kiwi.desktop 2007-08-09 11:34:48.000000000 +0200
@@ -18,6 +18,6 @@
Icon=yast-kiwi
Exec=/sbin/yast2 kiwi
-Name=Live Image Creator
-GenericName=Create the Live, USB or XEN image
+Name=Image Creator
+GenericName=Create the Live CD, USB or XEN image
X-KDE-SubstituteUID=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.2/src/kiwi_dialogs.ycp new/yast2-product-creator-2.15.3/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.15.2/src/kiwi_dialogs.ycp 2007-08-02 11:50:38.000000000 +0200
+++ new/yast2-product-creator-2.15.3/src/kiwi_dialogs.ycp 2007-08-09 14:42:35.000000000 +0200
@@ -705,7 +705,6 @@
map content = ProductCreator::ReadContentFile(src_id);
KiwiConfig = ProductCreator::Config;
-y2internal ("sources: %1", KiwiConfig["sources"]:nil);
// busy popup
Popup::ShowFeedback (_("Reading current live image configuration..."), _("Please wait..."));
@@ -754,11 +753,19 @@
if (!KiwiConfig["_imported"]:false)
{
// for new configuration, do not read all from the template
-y2warning ("------------------------------ new configuration ---------------");
+ y2milestone ("product-creator based configuration...");
foreach (string key, ["addons", "packages", "sources"], {
KiwiConfig[key] = ProductCreator::Config[key]:[];
});
}
+ else
+ {
+ y2milestone ("imported configuration...");
+ // "sources" are already there...
+ foreach (string key, ["addons", "packages"], {
+ ProductCreator::Config[key] = KiwiConfig[key]:[];
+ });
+ }
map label2boot = $[
"openSUSE 10.2" : "suse-10.2",
@@ -1388,19 +1395,21 @@
string name = Config["name"]:"";
string out_dir = Config["iso-directory"]:"";
map repositories = $[];
+ // originally enabled list of sources
+ list<map> enabled_sources = [];
- // on start, disable all sources (-> move to client?)
+ // on start, show the default YaST sources
if (Config == $[])
{
Pkg::SourceRestore ();
Pkg::SourceLoad();
- list<map> all_sources = Pkg::SourceEditGet();
- all_sources = maplist (map source, all_sources, {
- source["enabled"] = false;
- return source;
+ Config["sources"] = maplist (map source, Pkg::SourceEditGet (), {
+ integer srcid = source["SrcId"]:-1;
+ map data = Pkg::SourceGeneralData (srcid);
+ string url = data["url"]:"";
+ repositories[srcid] = url;
+ return url;
});
- Pkg::SourceEditSet ((list