Author: aschnell Date: Thu Dec 22 13:02:01 2011 New Revision: 67066 URL: http://svn.opensuse.org/viewcvs/yast?rev=67066&view=rev Log: - fixed Dm::getUsing Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.h Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc?rev=67066&r1=67065&r2=67066&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dm.cc Thu Dec 22 13:02:01 2011 @@ -507,7 +507,9 @@ Dm::getUsing() const { list<string> ret; - ret.push_back(cont->device()); + for (map<string, unsigned long>::const_iterator it = pe_map.begin(); it != pe_map.end(); ++it) + if (it->second > 0) + ret.push_back(it->first); return ret; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.cc?rev=67066&r1=67065&r2=67066&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.cc Thu Dec 22 13:02:01 2011 @@ -177,6 +177,16 @@ return( txt ); } + + list<string> + DmPart::getUsing() const + { + list<string> ret; + ret.push_back(cont->device()); + return ret; + } + + void DmPart::getInfo( DmPartInfo& tinfo ) const { Volume::getInfo(info.v); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.h?rev=67066&r1=67065&r2=67066&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPart.h Thu Dec 22 13:02:01 2011 @@ -58,6 +58,7 @@ void updateSize(); void getCommitActions(list<commitAction>& l) const; void addUdevData(); + virtual list<string> getUsing() const; virtual list<string> udevId() const; virtual Text setTypeText(bool doing) const; static bool notDeleted( const DmPart& l ) { return( !l.deleted() ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.cc?rev=67066&r1=67065&r2=67066&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.cc Thu Dec 22 13:02:01 2011 @@ -175,6 +175,15 @@ } + list<string> + LvmLv::getUsing() const + { + list<string> ret; + ret.push_back(cont->device()); + return ret; + } + + Text LvmLv::removeText( bool doing ) const { Text txt; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.h?rev=67066&r1=67065&r2=67066&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmLv.h Thu Dec 22 13:02:01 2011 @@ -68,7 +68,7 @@ Text resizeText( bool doing ) const; void getInfo( storage::LvmLvInfo& info ) const; bool equalContent( const LvmLv& rhs ) const; - + virtual list<string> getUsing() const; void logDifference(std::ostream& log, const LvmLv& rhs) const; static bool notDeleted(const LvmLv& l) { return !l.deleted(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org