Author: jsuchome Date: Mon Jun 8 13:05:53 2009 New Revision: 57479 URL: http://svn.opensuse.org/viewcvs/yast?rev=57479&view=rev Log: - updated help texts - fixed cross-architecture checks (bnc#503906) - 2.18.6 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=57479&r1=57478&r2=57479&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Mon Jun 8 13:05:53 2009 @@ -1 +1 @@ -2.18.5 +2.18.6 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=57479&r1=57478&r2=57479&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Mon Jun 8 13:05:53 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.18.6 + +------------------------------------------------------------------- Thu May 21 09:46:38 CEST 2009 - jsuchome@suse.cz - merged changes from CODE11: Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?rev=57479&r1=57478&r2=57479&view=diff ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Mon Jun 8 13:05:53 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: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=57479&r1=57478&r2=57479&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Jun 8 13:05:53 2009 @@ -1568,7 +1568,9 @@ "opt" : [ `hstretch ], // textentry label "label" : _("&Size"), - "help" : _("<p>Set the image <b>Size</b> in the specified <b>Unit</b>.</p>"), + // help text for "Size" field and "Additive" checkbox + "help" : _("<p>Set the image <b>Size</b> in the specified <b>Unit</b>. +If <b>Additive</b> is checked, the meaning of <b>Size</b> is different: it is the minimal free space available on the image.</p>"), "init" : InitSize, "store" : StoreSize, "handle" : HandleSize, @@ -1586,7 +1588,7 @@ "widget" : `checkbox, // check box label "label" : _("Additive"), - "no_help" : true,// 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