Author: locilka Date: Thu Mar 20 12:33:08 2008 New Revision: 45636 URL: http://svn.opensuse.org/viewcvs/yast?rev=45636&view=rev Log: - Not displaying a pop-up warning when upgrading ppc to ppc64 and vice versa. The current check can't really distinguish between these two. - 2.16.5 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/include/rootpart.ycp trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=45636&r1=45635&r2=45636&view=diff ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Thu Mar 20 12:33:08 2008 @@ -1 +1 @@ -2.16.4 +2.16.5 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=45636&r1=45635&r2=45636&view=diff ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Mar 20 12:33:08 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Mar 20 11:37:54 CET 2008 - locilka@suse.cz + +- Not displaying a pop-up warning when upgrading ppc to ppc64 and + vice versa. The current check can't really distinguish between + these two. +- 2.16.5 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?rev=45636&r1=45635&r2=45636&view=diff ============================================================================== --- trunk/update/src/include/rootpart.ycp (original) +++ trunk/update/src/include/rootpart.ycp Thu Mar 20 12:33:08 2008 @@ -101,6 +101,23 @@ return part_list; } +// Returns whether wanted and selected architectures match +// bnc #372309 +boolean DoArchitecturesMatch (string arch_1, string arch_2) { + list <string> ppc_archs = ["ppc", "ppc64"]; + + // exact match + if (arch_1 == arch_2) { + return true; + // ppc exception + } else if (contains (ppc_archs, arch_1) && contains (ppc_archs, arch_2)) { + return true; + } + + // else + return false; +} + // This dialog comes in three different flavors: `update_dialog, // `update_popup and `boot_popup, `update_dialog_proposal symbol RootPartitionDialog (symbol flavor) { @@ -280,7 +297,7 @@ _("No installed system that can be upgraded with this product was found on the selected partition.")); } - else if (freshman[`arch]:"" != RootPart::GetDistroArch ()) + else if (! DoArchitecturesMatch (freshman[`arch]:"", RootPart::GetDistroArch())) { cont = Popup::ContinueCancel ( // continue-cancel popup Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=45636&r1=45635&r2=45636&view=diff ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Thu Mar 20 12:33:08 2008 @@ -1549,6 +1549,7 @@ global void Detect () { if (!didSearchForRootPartitions) { + // FIXME: can we use a Progress for that? UI::OpenDialog (`opt(`decorated ), // label `Label(_("Evaluating root partition. One moment please..."))); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org