Hello community, here is the log from the commit of package yast2-update checked in at Thu Mar 15 01:52:33 CET 2007. -------- --- yast2-update/yast2-update.changes 2007-03-02 16:29:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-03-13 15:48:05.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 13 15:47:25 CET 2007 - locilka@suse.cz + +- When checking the installed system either for Update or Boot + Installed System, consider partition valid when inst-sys is PPC + and installed system is PPC64. Don't be so strict (#249791). +- 2.15.6 + +------------------------------------------------------------------- Old: ---- yast2-update-2.15.5.tar.bz2 New: ---- yast2-update-2.15.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.j12899/_old 2007-03-15 01:52:29.000000000 +0100 +++ /var/tmp/diff_new_pack.j12899/_new 2007-03-15 01:52:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.15.5) +# spec file for package yast2-update (Version 2.15.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-update -Version: 2.15.5 +Version: 2.15.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.15.5.tar.bz2 +Source0: yast2-update-2.15.6.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite yast2-xml Requires: yast2 @@ -51,7 +51,7 @@ Jiri Srain <jsrain@suse.cz> %prep -%setup -n yast2-update-2.15.5 +%setup -n yast2-update-2.15.6 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +86,11 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog +* Tue Mar 13 2007 - locilka@suse.cz +- When checking the installed system either for Update or Boot + Installed System, consider partition valid when inst-sys is PPC + and installed system is PPC64. Don't be so strict (#249791). +- 2.15.6 * Thu Mar 01 2007 - locilka@suse.cz - Added more logging because of bug #249791. - Better layout for "Select System or Partition to Boot" dialog. ++++++ yast2-update-2.15.5.tar.bz2 -> yast2-update-2.15.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.5/src/modules/RootPart.ycp new/yast2-update-2.15.6/src/modules/RootPart.ycp --- old/yast2-update-2.15.5/src/modules/RootPart.ycp 2007-03-01 15:13:38.000000000 +0100 +++ new/yast2-update-2.15.6/src/modules/RootPart.ycp 2007-03-13 15:48:23.000000000 +0100 @@ -6,7 +6,7 @@ * Purpose: Responsible for searching of root partitions and * mounting of target partitions. * - * $Id: RootPart.ycp 36613 2007-03-01 14:13:35Z locilka $ + * $Id: RootPart.ycp 36935 2007-03-13 14:48:20Z locilka $ */ { module "RootPart"; @@ -1176,15 +1176,24 @@ // Right architecture? freshman[`arch] = GetArchOfELF (Installation::destdir + "/bin/bash"); - if (freshman[`arch]:"unknown" == GetArchOfELF ("/bin/bash")) - { + string instsys_arch = GetArchOfELF ("/bin/bash"); + + // installed /bin/bash and the one from inst-sys are matching + if (freshman[`arch]:"unknown" == instsys_arch) { freshman[`valid] = ok; - } - else - { - y2milestone ("Architecture for partition %1 is %2, upgrading %3", p_dev, freshman[`arch]:"unknown", GetArchOfELF ("/bin/bash")); + // both are PPC, bugzilla #249791 + } else if ( + contains(["ppc", "ppc64"], freshman[`arch]:"unknown") + && + contains(["ppc", "ppc64"], instsys_arch) + ) { + y2milestone ("Architecture for partition %1 is %2, upgrading %3", p_dev, freshman[`arch]:"unknown", instsys_arch); + freshman[`valid] = true; + } else { + y2milestone ("Architecture for partition %1 is %2, upgrading %3", p_dev, freshman[`arch]:"unknown", instsys_arch); freshman[`valid] = false; } + y2milestone ("Partition is valid: %1", freshman[`valid]:false); } // unmount partition diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.5/VERSION new/yast2-update-2.15.6/VERSION --- old/yast2-update-2.15.5/VERSION 2007-03-02 16:29:56.000000000 +0100 +++ new/yast2-update-2.15.6/VERSION 2007-03-13 15:48:10.000000000 +0100 @@ -1 +1 @@ -2.15.5 +2.15.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org