Mailinglist Archive: yast-commit (169 mails)

< Previous Next >
[yast-commit] r67714 - /trunk/ncurses-pkg/src/NCPkgTable.cc
Author: gs
Date: Tue Mar 27 13:03:12 2012
New Revision: 67714

URL: http://svn.opensuse.org/viewcvs/yast?rev=67714&view=rev
Log:
correct package status check for update and delete

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=67714&r1=67713&r2=67714&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgTable.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgTable.cc Tue Mar 27 13:03:12 2012
@@ -1002,26 +1002,21 @@
break;
}
case A_Delete: {
- if ( slbPtr->status() == S_KeepInstalled )
+ if ( slbPtr->installedObj() && slbPtr->status() !=
S_Protected )
ok = statusStrategy->keyToStatus( '-', slbPtr, objPtr,
newStatus );
break;
}
case A_UpdateNewer: {
// set status to update respecting "vendor change"
settings
- if ( slbPtr->status() == S_KeepInstalled &&
slbPtr->updateCandidateObj() )
+ if ( slbPtr->installedObj() && slbPtr->status() !=
S_Protected && 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: {
- if ( slbPtr->status() == S_KeepInstalled )
+ if ( slbPtr->installedObj() && slbPtr->status() !=
S_Protected )
ok = statusStrategy->keyToStatus( '>', slbPtr, objPtr,
newStatus );
break;
}

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

< Previous Next >
This Thread
  • No further messages