Hello community,
here is the log from the commit of package yast2-add-on-creator
checked in at Sat May 31 12:11:01 CEST 2008.
--------
--- yast2-add-on-creator/yast2-add-on-creator.changes 2008-05-26 16:02:01.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2008-05-30 11:37:27.873220000 +0200
@@ -1,0 +2,6 @@
+Fri May 30 11:28:43 CEST 2008 - jsuchome@suse.cz
+
+- CLI: read current product data after it was cleared (bnc#395753)
+- 2.16.12
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-creator-2.16.11.tar.bz2
New:
----
yast2-add-on-creator-2.16.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.O22904/_old 2008-05-31 12:10:55.000000000 +0200
+++ /var/tmp/diff_new_pack.O22904/_new 2008-05-31 12:10:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on-creator (Version 2.16.11)
+# spec file for package yast2-add-on-creator (Version 2.16.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-add-on-creator
-Version: 2.16.11
+Version: 2.16.12
Release: 1
License: GPL v2 only; GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-creator-2.16.11.tar.bz2
+Source0: yast2-add-on-creator-2.16.12.tar.bz2
Prefix: /usr
PreReq: %fillup_prereq
Requires: yast2
@@ -35,7 +35,7 @@
Jiř� Suchomel
%prep
-%setup -n yast2-add-on-creator-2.16.11
+%setup -n yast2-add-on-creator-2.16.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,9 @@
%doc %{prefix}/share/doc/packages/yast2-add-on-creator
/var/adm/fillup-templates/sysconfig.add-on-creator
%changelog
+* Fri May 30 2008 jsuchome@suse.cz
+- CLI: read current product data after it was cleared (bnc#395753)
+- 2.16.12
* Mon May 26 2008 jsuchome@suse.cz
- enable reading pattern files with more patterns (bnc#393515)
- create_package_descr : added option for creating file lists (-F)
++++++ yast2-add-on-creator-2.16.11.tar.bz2 -> yast2-add-on-creator-2.16.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.11/src/add-on-creator.ycp new/yast2-add-on-creator-2.16.12/src/add-on-creator.ycp
--- old/yast2-add-on-creator-2.16.11/src/add-on-creator.ycp 2008-05-26 16:01:34.000000000 +0200
+++ new/yast2-add-on-creator-2.16.12/src/add-on-creator.ycp 2008-05-30 11:18:48.000000000 +0200
@@ -328,9 +328,19 @@
SCR::Execute (.target.mkdir, current_product["base_output_path"]:"");
}
AddOnCreator::current_product = current_product;
+ AddOnCreator::selected_product = -1; // new product
AddOnCreator::CommitCurrentProduct ();
+
if (haskey (options, "do_not_build"))
return true;
+
+ // now, build the product that was added last: current product data
+ // must be initialized again:
+ AddOnCreator::current_product =
+ AddOnCreator::add_on_products[size(AddOnCreator::add_on_products)-1]:$[];
+ // fill again other global values cleared by CommitCurrentProduct
+ AddOnCreator::SelectProduct (AddOnCreator::current_product);
+
return AddOnCreator::BuildAddOn ();
}
@@ -387,7 +397,6 @@
*/
boolean SignAddOn (map options) {
- map current_product = AddOnCreator::current_product;
AddOnCreator::only_sign_product = false;
if (!haskey (options, "addon_dir"))
{
@@ -396,18 +405,25 @@
return false;
}
else
- current_product["base_output_path"] = options["addon_dir"]:"";
+ {
+ AddOnCreator::current_product["base_output_path"] =
+ options["addon_dir"]:"";
+ }
// we need to import same data from existing add-on (e.g. for iso name)
- AddOnCreator::ImportExistingProduct(current_product["base_output_path"]:"");
+ AddOnCreator::ImportExistingProduct (options["addon_dir"]:"");
AddOnCreator::FillContentDefaults ();
+ map current_product = AddOnCreator::current_product;
+
current_product = union (current_product, ParseGPGData (options));
current_product = union (current_product, ParseISOData (options));
AddOnCreator::only_sign_product = true;
AddOnCreator::current_product = current_product;
- AddOnCreator::CommitCurrentProduct ();
- return AddOnCreator::BuildAddOn ();
+ AddOnCreator::BuildAddOn ();
+ return false;
+ // no write needed (configs were not modified, or there was only one-time
+ // modification: iso, gpg info)
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.11/src/AddOnCreator.ycp new/yast2-add-on-creator-2.16.12/src/AddOnCreator.ycp
--- old/yast2-add-on-creator-2.16.11/src/AddOnCreator.ycp 2008-05-26 16:01:34.000000000 +0200
+++ new/yast2-add-on-creator-2.16.12/src/AddOnCreator.ycp 2008-05-30 10:52:01.000000000 +0200
@@ -2388,7 +2388,10 @@
full_data_path = "";
}
-// save the data with current configuration into global list
+/**
+ * save the data with current configuration into global list
+ * + reset the current product map
+ */
global void CommitCurrentProduct () {
map modified_product = union (current_product, $[
@@ -2554,6 +2557,7 @@
{
// Error message (do not translate 'content'
Report::Error (_("Cannot write content file."));
+ return false;
}
WriteStringFiles (base_output_path,
@@ -2569,6 +2573,7 @@
{
// Error message
Report::Error (_("Cannot create the output directory structure."));
+ return false;
}
WritePatchesFiles (base_output_path,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.11/VERSION new/yast2-add-on-creator-2.16.12/VERSION
--- old/yast2-add-on-creator-2.16.11/VERSION 2008-05-26 14:04:47.000000000 +0200
+++ new/yast2-add-on-creator-2.16.12/VERSION 2008-05-30 11:30:39.000000000 +0200
@@ -1 +1 @@
-2.16.11
+2.16.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org