Author: lslezak Date: Wed Jun 4 13:22:39 2008 New Revision: 48063 URL: http://svn.opensuse.org/viewcvs/yast?rev=48063&view=rev Log: - removed the workaround for locking 64-bit packages on PPC32 (bnc#336678) 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=48063&r1=48062&r2=48063&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Jun 4 13:22:39 2008 @@ -1 +1 @@ -2.16.53 +2.17.0 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=48063&r1=48062&r2=48063&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jun 4 13:22:39 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 13:19:01 CEST 2008 - lslezak@suse.cz + +- removed the workaround for locking 64-bit packages on PPC32 + (bnc#336678) + +------------------------------------------------------------------- Tue Jun 3 15:09:36 CEST 2008 - lslezak@suse.cz - Display the error message properly in the media change popup. Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.ycp?rev=48063&r1=48062&r2=48063&view=diff ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Jun 4 13:22:39 2008 @@ -1259,27 +1259,10 @@ } } -// lock packages if needed +// lock some packages if needed void LockPackages() { - // lock 64-bit packages on PPC32 (bnc#336678) - if (Arch::ppc32()) - { - y2milestone("PPC32 detected, locking 64-bit packages..."); - - map<string,any> 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)); - } + // currently there is no need to lock any package... } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org