Author: jsuchome Date: Fri Jun 12 14:39:59 2009 New Revision: 57551 URL: http://svn.opensuse.org/viewcvs/yast?rev=57551&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.18.7 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/wizards.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=57551&r1=57550&r2=57551&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Jun 12 14:39:59 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=57551&r1=57550&r2=57551&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Jun 12 14:39:59 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 12 14:29:07 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.18.7 + +------------------------------------------------------------------- Mon Jun 8 12:49:38 CEST 2009 - jsuchome@suse.cz - updated help texts Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?rev=57551&r1=57550&r2=57551&view=diff ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Fri Jun 12 14:39:59 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: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?rev=57551&r1=57550&r2=57551&view=diff ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Fri Jun 12 14:39:59 2009 @@ -1500,6 +1500,7 @@ %1 "), details)); + Wizard::CloseDialog(); return $["ui" : `failed]; } Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=57551&r1=57550&r2=57551&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Jun 12 14:39:59 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 ret_map = runPackageSelector ("", maplist (map pat, sw_contents["opensusePattern"]:[], @@ -2323,6 +2326,8 @@ continue; repositories = remove (repositories, selected); update_repo_table (); + if (size (repositories) > 0) + UI::SetFocus (`id (`repositories)); } else if (ret == `browse) { @@ -2380,7 +2385,9 @@ UI::QueryWidget (`id (`i386), `Value) == true) { Kiwi::image_architecture = "i386"; - ProductCreator::SetPackageArch ("i386"); + ProductCreator::SetPackageArch ("i686"); + // closing sources, so they are created again with correct arch (bnc#510971) + Pkg::SourceFinishAll (); } if (size (repositories) > 0) @@ -2399,12 +2406,8 @@ url = "dir://" + url; if (haskey (current_sources, url)) { -// integer srcid = current_sources[url]:-1; current_sources = remove (current_sources, url); return true; - // TODO is it correct to check architecture now? - // but why not to list repositories that won't be used... -// return CheckArchitecture (srcid); } integer source_ret = -1; string full_url = url; @@ -2420,12 +2423,6 @@ return false; } return true; - /* see above... - if (CheckArchitecture (source_ret)) - return true; - else - return false; - */ }); foreach (string url, integer srcid, current_sources, { Pkg::SourceDelete (srcid); Modified: trunk/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/wizards.ycp?rev=57551&r1=57550&r2=57551&view=diff ============================================================================== --- trunk/product-creator/src/wizards.ycp (original) +++ trunk/product-creator/src/wizards.ycp Fri Jun 12 14:39:59 2009 @@ -148,6 +148,8 @@ */ symbol InitRepositories () { + // finish sources before next start, so 32bit and 64bit don't get mangled (bnc#510971) + Pkg::SourceFinishAll (); Kiwi::initial_repositories = Kiwi::InitCurrentRepositories (); Kiwi::Read (); return `next; @@ -209,7 +211,7 @@ ], "kiwi": $[ `abort : `abort, - `next : "images_overview", + `next : "init_repositories", ], ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org