Author: aschnell Date: Sat Jun 7 00:02:52 2008 New Revision: 48144 URL: http://svn.opensuse.org/viewcvs/yast?rev=48144&view=rev Log: - fixed deletion of logical volumes (bnc #397186) Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/Dm.h trunk/storage/libstorage/src/LvmVg.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=48144&r1=48143&r2=48144&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Sat Jun 7 00:02:52 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev=48144&r1=48143&r2=48144&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Sat Jun 7 00:02:52 2008 @@ -333,6 +333,24 @@ setSize( num_le*pec()->peSize() ); } + +void Dm::setPeMap( const std::map& m ) +{ + pe_map = m; + + // remove usused entries + // TODO: do not generate pe_maps with unused entries in the first place + for(std::map::iterator i = pe_map.begin(); i != pe_map.end(); ) { + if (i->second == 0) + pe_map.erase(i++); + else + ++i; + } + + y2mil("device:" << device() << " pe_map:" << pe_map); +} + + void Dm::changeDeviceName( const string& old, const string& nw ) { map::const_iterator mit = pe_map.find( old ); Modified: trunk/storage/libstorage/src/Dm.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.h?rev=48144&r1=48143&r2=48144&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dm.h (original) +++ trunk/storage/libstorage/src/Dm.h Sat Jun 7 00:02:52 2008 @@ -29,7 +29,7 @@ bool removeTable(); void calcSize(); const std::map& getPeMap() const { return( pe_map ); } - void setPeMap( const std::map& m ) { pe_map = m; } + void setPeMap( const std::map& m ); unsigned long long usingPe( const string& dev ) const; bool mapsTo( const string& dev ) const; void getTableInfo(); Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?rev=48144&r1=48143&r2=48144&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Sat Jun 7 00:02:52 2008 @@ -199,7 +199,7 @@ ret = tryUnusePe( d, pl, pladd, plrem, rem_pe ); ++i; } - y2mil( "add:" << pv_add.size() << " pv:" << pv.size() << " remove:" << devs.size() ); + y2mil( "add:" << pv_add.size() << " pv:" << pv.size() << " remove:" << pv_remove.size() ); if( ret==0 && pv_add.size()+pv.size()-devs.size()<=0 ) ret = LVM_VG_HAS_NONE_PV; if( ret == 0 ) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=48144&r1=48143&r2=48144&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Sat Jun 7 00:02:52 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 06 23:52:22 CEST 2008 - aschnell@suse.de + +- fixed deletion of logical volumes (bnc #397186) +- version 2.17.1 + +------------------------------------------------------------------- Mon Jun 02 15:23:24 CEST 2008 - aschnell@suse.de - run storage_finish.ycp during live-installation (bug #389188) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org