Author: schubi2 Date: Mon May 19 18:13:02 2008 New Revision: 10145 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10145&view=rev Log: - Resetting Delete Details in ResStatus correctly (bnc #391785) Modified: trunk/libzypp/zypp/ResStatus.h Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=10145&r1=10144&r2=10145&view=diff ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Mon May 19 18:13:02 2008 @@ -13,7 +13,6 @@ #define ZYPP_RESSTATUS_H #include <iosfwd> - #include "zypp/Bit.h" /////////////////////////////////////////////////////////////////// @@ -402,27 +401,26 @@ // we're already in the desired state, but in case of // TRANSACT, remember a superior causer. if ( transacts() && isLessThan<TransactByField>( causer_r ) ) - { fieldValueAssign<TransactByField>( causer_r ); - // ??? adapt TransactDetailField ? - } + + fieldValueAssign<TransactDetailField>( NO_DETAIL ); // Details has to be set again return true; } // Here: transact status is to be changed: if ( ! fieldValueIs<TransactField>( KEEP_STATE ) - && isGreaterThan<TransactByField>( causer_r ) ) + && isGreaterThan<TransactByField>( causer_r ) ) { return false; + } if ( toTansact_r ) - { + { fieldValueAssign<TransactField>( TRANSACT ); - // ??? adapt TransactDetailField ? - } + } else - { + { fieldValueAssign<TransactField>( KEEP_STATE ); - fieldValueAssign<TransactDetailField>( NO_DETAIL ); - } + } + fieldValueAssign<TransactDetailField>( NO_DETAIL ); // Details has to be set again fieldValueAssign<TransactByField>( causer_r ); return true; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org