Author: lslezak Date: Fri Jul 10 13:14:16 2009 New Revision: 58006 URL: http://svn.opensuse.org/viewcvs/yast?rev=58006&view=rev Log: - fixed cross-architecture problems (bnc#510971) - 2.17.23 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/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=58006&r1=58005&r2=58006&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Fri Jul 10 13:14:16 2009 @@ -1 +1 @@ -2.17.22 +2.17.23 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=58006&r1=58005&r2=58006&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 Jul 10 13:14:16 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 10 13:11:25 CEST 2009 - lslezak@suse.cz + +- fixed cross-architecture problems (bnc#510971) +- 2.17.23 + +------------------------------------------------------------------- Wed Jul 1 09:46:11 CEST 2009 - jsuchome@suse.cz - yast2-slp not needed in BuildRequires (reverting unintended 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=58006&r1=58005&r2=58006&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 Jul 10 13:14:16 2009 @@ -2395,13 +2395,17 @@ ProductCreator::ResetArch(); - if (Arch::architecture () == "x86_64" && - UI::QueryWidget (`id (`i386), `Value) == true) + if (Arch::architecture () == "x86_64") { - Kiwi::image_architecture = "i386"; - ProductCreator::SetPackageArch ("i686"); - // closing sources, so they are created again with correct arch (bnc#510971) - Pkg::SourceFinishAll (); + Kiwi::image_architecture = "x86_64"; + if (UI::QueryWidget (`id (`i386), `Value) == true) + { + Kiwi::image_architecture = "i386"; + // closing sources, so they are created again with correct arch (bnc#510971) + Pkg::SourceFinishAll (); + Pkg::SourceStartManager(false); + ProductCreator::SetPackageArch ("i686"); + } } if (size (repositories) > 0) Modified: branches/SuSE-Code-11-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/wizards.ycp?rev=58006&r1=58005&r2=58006&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/wizards.ycp Fri Jul 10 13:14:16 2009 @@ -150,6 +150,8 @@ // finish sources before next start, so 32bit and 64bit don't get mangled (bnc#510971) Pkg::SourceFinishAll (); + Pkg::SourceStartManager(false); + Kiwi::initial_repositories = Kiwi::InitCurrentRepositories (); Kiwi::Read (); return `next; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org