Mailinglist Archive: yast-commit (282 mails)

[gs@xxxxxxxxxxxxxxxxx]

Author: gs
Date: Fri Mar 23 13:33:57 2012
New Revision: 67696

URL: http://svn.opensuse.org/viewcvs/yast?rev=67696&view=rev
Log:
use correct libzypp call to get correct candidate
for update

Modified:
    trunk/ncurses-pkg/src/NCPkgTable.cc

Modified: trunk/ncurses-pkg/src/NCPkgTable.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?rev=67696&r1=67695&r2=67696&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgTable.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgTable.cc Fri Mar 23 13:33:57 2012
@@ -1007,10 +1007,17 @@
                    break;
                }
                case A_UpdateNewer: {
-                   if ( slbPtr->status() == S_KeepInstalled && 
slbPtr->hasCandidateObj() ) {
-                       if ( slbPtr->installedObj()->edition() < 
slbPtr->candidateObj()->edition() ) 
-                           ok = statusStrategy->keyToStatus( '>', slbPtr, 
objPtr, newStatus );
-                   }
+                    // set status to update respecting "vendor change" 
settings 
+                    if ( slbPtr->status() == S_KeepInstalled && 
slbPtr->updateCandidateObj() )
+                    {
+                        slbPtr->setOnSystem( slbPtr->updateCandidateObj() );
+                        ok = statusStrategy->keyToStatus( '>', slbPtr, objPtr, 
newStatus );
+                    }
+                    
+                   //if ( slbPtr->status() == S_KeepInstalled && 
slbPtr->hasCandidateObj() ) {
+                   //    if ( slbPtr->installedObj()->edition() < 
slbPtr->candidateObj()->edition() ) 
+                    //     ok = statusStrategy->keyToStatus( '>', slbPtr, 
objPtr, newStatus );
+                   //}
                    break;
                }
                case A_Update: {

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx