[yast-commit] r57549 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes src/complex.ycp src/dialogs.ycp src/kiwi_dialogs.ycp src/wizards.ycp
Author: jsuchome
Date: Fri Jun 12 14:39:45 2009
New Revision: 57549
URL: http://svn.opensuse.org/viewcvs/yast?rev=57549&view=rev
Log:
- do not forget to close opened windows on error (bnc#511436)
- correctly set target 32bit architecture on x86_64 (bnc#510971)
- with "additive", do not count the packages size (bnc#512358)
- 2.17.20
Modified:
branches/SuSE-Code-11-Branch/product-creator/VERSION
branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp
branches/SuSE-Code-11-Branch/product-creator/src/dialogs.ycp
branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp
branches/SuSE-Code-11-Branch/product-creator/src/wizards.ycp
Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/VERSION?rev=57549&r1=57548&r2=57549&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-Branch/product-creator/VERSION Fri Jun 12 14:39:45 2009
@@ -1 +1 @@
-2.17.19
+2.17.20
Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes?rev=57549&r1=57548&r2=57549&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original)
+++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Fri Jun 12 14:39:45 2009
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Jun 11 16:37:39 CEST 2009 - jsuchome@suse.cz
+
+- do not forget to close opened windows on error (bnc#511436)
+- correctly set target 32bit architecture on x86_64 (bnc#510971)
+- with "additive", do not count the packages size (bnc#512358)
+- 2.17.20
+
+-------------------------------------------------------------------
Mon Jun 8 12:49:38 CEST 2009 - jsuchome@suse.cz
- updated help texts
Modified: branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp?rev=57549&r1=57548&r2=57549&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp (original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Fri Jun 12 14:39:45 2009
@@ -75,7 +75,7 @@
if (arch == "i386" && sysarch == "x86_64")
{
// Kiwi.ycp asks if GetArch is i386
- ProductCreator::SetPackageArch ("i386");
+ ProductCreator::SetPackageArch ("i686");
return true;
}
// is the target architecture different than the machine architecture?
Modified: branches/SuSE-Code-11-Branch/product-creator/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/dialogs.ycp?rev=57549&r1=57548&r2=57549&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/dialogs.ycp (original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/dialogs.ycp Fri Jun 12 14:39:45 2009
@@ -1500,6 +1500,7 @@
%1
"), details));
+ Wizard::CloseDialog();
return $["ui" : `failed];
}
Modified: branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp?rev=57549&r1=57548&r2=57549&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp (original)
+++ branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Fri Jun 12 14:39:45 2009
@@ -229,6 +229,9 @@
if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G")
mbytes = mbytes * 1024;
ProductCreator::max_size_mb = mbytes;
+ // no size check for "additive" (bnc#512358)
+ if (UI::QueryWidget (`id ("additive"), `Value) == true)
+ ProductCreator::max_size_mb = 999 * 1024 * 1024;
map
participants (1)
-
jsuchome@svn.opensuse.org