Author: jsuchome Date: Mon Jun 8 13:05:44 2009 New Revision: 57478 URL: http://svn.opensuse.org/viewcvs/yast?rev=57478&view=rev Log: - updated help texts - fixed cross-architecture checks (bnc#503906) - 2.17.19 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/kiwi_dialogs.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=57478&r1=57477&r2=57478&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Mon Jun 8 13:05:44 2009 @@ -1 +1 @@ -2.17.18 +2.17.19 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=57478&r1=57477&r2=57478&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 Mon Jun 8 13:05:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 8 12:49:38 CEST 2009 - jsuchome@suse.cz + +- updated help texts +- fixed cross-architecture checks (bnc#503906) +- 2.17.19 + +------------------------------------------------------------------- Wed May 20 23:21:19 CEST 2009 - jsuchome@suse.cz - added openssl-certs to default bootstrap section, so Update repos 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=57478&r1=57477&r2=57478&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Mon Jun 8 13:05:44 2009 @@ -64,9 +64,20 @@ // needed for creating kiwi images because kiwi cannot create cross-architecture images boolean SameArchitecture() { - string arch = ProductCreator::GetArch (); - string sysarch = Arch::architecture(); - + // current config's arch + string arch = ProductCreator::Config["arch"]:""; + if (contains(["i486", "i586", "i686"], arch)) + arch = "i386"; + // system's arch + string sysarch = ProductCreator::GetArch (); + + // possible combination + if (arch == "i386" && sysarch == "x86_64") + { + // Kiwi.ycp asks if GetArch is i386 + ProductCreator::SetPackageArch ("i386"); + return true; + } // is the target architecture different than the machine architecture? if (arch != nil && arch != "" && arch != sysarch) { 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=57478&r1=57477&r2=57478&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 Mon Jun 8 13:05:44 2009 @@ -1587,7 +1587,7 @@ "widget" : `checkbox, // check box label "label" : _("Additive"), - "no_help" : ,// FIXME the meaning of size is different...! + "no_help" : true, "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org