Author: fehr Date: Thu Oct 11 13:14:15 2007 New Revision: 41363 URL: http://svn.opensuse.org/viewcvs/yast?rev=41363&view=rev Log: fix bug in member function equalContent (#245734) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Disk.cc Thu Oct 11 13:14:15 2007 @@ -2597,7 +2597,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/DmCo.cc Thu Oct 11 13:14:15 2007 @@ -344,7 +344,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/EvmsCo.cc Thu Oct 11 13:14:15 2007 @@ -1941,7 +1941,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LoopCo.cc Thu Oct 11 13:14:15 2007 @@ -397,7 +397,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/LvmVg.cc Thu Oct 11 13:14:15 2007 @@ -1501,7 +1501,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/MdCo.cc Thu Oct 11 13:14:15 2007 @@ -725,7 +725,7 @@ ++i; ++j; } - ret == ret && i==p.end() && j==pc.end(); + ret = ret && i==p.end() && j==pc.end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/PeContainer.cc Thu Oct 11 13:14:15 2007 @@ -727,7 +727,7 @@ CVIter j = begin(); while( ret && i!=rhs.end() && j!=end() ) ret = ret && ((Dm*)(&(*j)))->equalContent( *(Dm*)(&(*i))); - ret == ret && i==rhs.end() && j==end(); + ret = ret && i==rhs.end() && j==end(); } return( ret ); } Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/src/Storage.cc Thu Oct 11 13:14:15 2007 @@ -4445,7 +4445,7 @@ } void -Storage::logCo( Container* c ) +Storage::logCo( Container* c ) const { std::ostringstream b; c->print( b ); Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes?rev=41363&r1=41362&r2=41363&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 11 13:14:15 2007 @@ -3,6 +3,7 @@ - add support for online resize of ext3 (feature #301943) - fix performance hog with large number of disks and swap areas (#267262) +- fix bug in member function equalContent (#245734) ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr@suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org