[yast-commit] r53688 - in /trunk/storage: VERSION libstorage/src/Storage.cc package/yast2-storage.changes

Author: aschnell Date: Fri Nov 28 12:05:37 2008 New Revision: 53688 URL: http://svn.opensuse.org/viewcvs/yast?rev=53688&view=rev Log: - fixed comparisons of libstorage backup states (bnc #438076) Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=53688&r1=53687&r2=53688&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Nov 28 12:05:37 2008 @@ -1 +1 @@ -2.17.56 +2.17.57 Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=53688&r1=53687&r2=53688&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Nov 28 12:05:37 2008 @@ -5657,12 +5657,12 @@ const Container* const c; }; + bool -Storage::equalBackupStates( const string& lhs, const string& rhs, - bool verbose_log ) const - { - y2milestone( "lhs:%s rhs:%s verbose:%d", lhs.c_str(), rhs.c_str(), - verbose_log ); +Storage::equalBackupStates(const string& lhs, const string& rhs, + bool verbose_log) const +{ + y2mil("lhs:" << lhs << " rhs:" << rhs << " verbose:" << verbose_log); map::const_iterator i; const CCont* l = NULL; const CCont* r = NULL; @@ -5704,7 +5704,7 @@ while( (ret||verbose_log) && i!=r->end() ) { j = find_if( l->begin(), l->end(), equal_co( *i ) ); - if( j==r->end() ) + if( j==l->end() ) { ret = false; if( verbose_log ) @@ -5714,8 +5714,9 @@ } } y2mil("ret:" << ret); - return( ret ); - } + return ret; +} + string Storage::backupStates() const Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=53688&r1=53687&r2=53688&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Nov 28 12:05:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 28 11:52:52 CET 2008 - aschnell@suse.de + +- fixed comparisons of libstorage backup states (bnc #438076) +- 2.17.57 + +------------------------------------------------------------------- Thu Nov 27 17:01:04 CET 2008 - locilka@suse.cz - Guessing real number of Storage SlideShow steps in respect to the -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org