Merge pull request #8 from jsuchome/master

create reasonable default when size was not defined (bnc#786696)

.gitignore

@@ -0,0 +1,31 @@
+Makefile
+Makefile.am
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.in
+depcomp
+install-sh
+*.pot
+libtool
+ltconfig
+ltmain.sh
+missing
+mkinstalldirs
+stamp-h*
+Makefile.am.common
+*.ami
+*.bz2
+*.spec
+.dep
+tmp.*
+*.log
+*.ybc

VERSION

@@ -1 +1 @@
-2.22.8
+2.23.0

package/yast2-product-creator.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  2 12:57:34 CET 2012 - jsuchome@suse.cz
+
+- create reasonable default when size was not defined (bnc#786696)
+- 2.23.0 
+
 -------------------------------------------------------------------
 Thu Aug 16 15:53:29 CEST 2012 - jsuchome@suse.cz
 

src/Kiwi.ycp

@@ -51,6 +51,9 @@
    */
   global string content_key	= "__yast_content__";
 
+  // default image size, if none was given (in MB)
+  global string default_size    = "10";
+
   include "product-creator/routines.ycp";
 
   string encryption_method	= nil;

src/ProductCreator.ycp

@@ -600,13 +600,7 @@ global define boolean Write() ``{
     // translators: error message
     if(!ret) Report::Error (_("Error while writing settings."));
 
-
-    // run SuSEconfig
-    if(Abort()) return false;
     Progress::NextStage ();
-    // translators: error message
-    if(false) Report::Error (_("SuSEconfig script failed."));
-    sleep(sl);
 
     if(Abort()) return false;
     // translators: progress finished

src/complex.ycp

@@ -718,8 +718,17 @@ define symbol ImagesOverviewDialog() {
 		Configurations[i]	= config;
 		map size_map	= get_current_size_map (config, task);
 		string unit	= size_map["unit"]:"M";
-		string i_size	= size_map[Kiwi::content_key]:"0" + unit;
-
+		string i_size	= size_map[Kiwi::content_key]:"";
+                // fallback values when size is not given
+                if (i_size == "")
+                {
+                    i_size      = Kiwi::default_size;
+                    if (size_map["additive"]:"" == "")
+                    {
+                      size_map["additive"]      = "true";
+                    }
+                }
+                i_size          = i_size + unit;
 		// with "additive", "size" has a different meaning
 		if (size_map["additive"]:"" == "true")
 		    i_size	= "+" + i_size;

src/kiwi_dialogs.ycp

@@ -604,8 +604,20 @@ Continue anyway?")))
   define void InitSize (string id) {
 
     map size_map    = get_current_size_map (KiwiConfig, kiwi_task);
-    integer siz	= tointeger (size_map[Kiwi::content_key]:"0");
-    if (siz == nil) siz	= 0;
+    integer siz = 0;
+    if (haskey (size_map, Kiwi::content_key))
+    {
+      siz       = tointeger (size_map[Kiwi::content_key]:"0");
+    }
+    // fallback values when size is not given
+    else
+    {
+        siz	= tointeger (Kiwi::default_size);
+        if (size_map["additive"]:"" == "")
+        {
+            size_map["additive"]        = "true";
+        }
+    }
     UI::ChangeWidget (`id ("size"), `Value, siz);
     UI::ChangeWidget (`id ("additive"), `Value, size_map["additive"]:"" == "true");
     UI::ChangeWidget (`id ("sizeunit"), `Items, maplist (string u, [ "M", "G" ], ``(