Author: lslezak Date: Mon May 12 17:45:51 2008 New Revision: 47465 URL: http://svn.opensuse.org/viewcvs/yast?rev=47465&view=rev Log: - lock 64-bit packages on PPC32 during installation (bnc#336678) - 2.16.46 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47465&r1=47464&r2=47465&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon May 12 17:45:51 2008 @@ -1 +1 @@ -2.16.45 +2.16.46 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=47465&r1=47464&r2=47465&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon May 12 17:45:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 12 17:35:40 CEST 2008 - lslezak@suse.cz + +- lock 64-bit packages on PPC32 during installation (bnc#336678) +- 2.16.46 + +------------------------------------------------------------------- Mon May 12 16:43:20 CEST 2008 - jsrain@suse.cz - copy the openSUSE product information from the media to the Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=47465&r1=47464&r2=47465&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon May 12 17:45:51 2008 @@ -1513,6 +1513,25 @@ { Pkg::SetAdditionalLocales ([Language::language]); } + + // lock 64-bit packages on PPC32 (bnc#336678) + if (Arch::ppc32()) + { + y2milestone("PPC32 detected, locking 64-bit packages..."); + + map lock = + $[ + "solvable:name" : [ "64bit" ] + ]; + + y2milestone("added lock %1: %2", lock, Pkg::AddLock(lock)); + + lock = + $[ + "solvable:name" : [ "ppc64" ] + ]; + y2milestone("added lock %1: %2", lock, Pkg::AddLock(lock)); + } } SelectProduct (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org