Author: aschnell Date: Tue Aug 19 13:42:28 2008 New Revision: 50201 URL: http://svn.opensuse.org/viewcvs/yast?rev=50201&view=rev Log: - make setUdevData take a list of strings as argument Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=50201&r1=50200&r2=50201&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue Aug 19 13:42:28 2008 @@ -179,19 +179,20 @@ } } -void Disk::setUdevData( const string& path, const string& id ) - { - y2milestone( "disk %s path %s id %s", nm.c_str(), path.c_str(), id.c_str() ); + +void +Disk::setUdevData(const string& path, const list<string>& id) +{ + y2mil("disk:" << nm << " path:" << path << "id:" << id); udev_path = path; - udev_id.clear(); - udev_id = splitString( id ); + udev_id = id; + list<string>::iterator i = find_if( udev_id.begin(), udev_id.end(), find_begin( "edd-" ) ); if( i!=udev_id.end() ) { udev_id.erase( i ); } - y2mil( "id:" << udev_id ); if( udev_id.size()>1 ) { i = find_if( udev_id.begin(), udev_id.end(), find_begin( "scsi-" ) ); @@ -202,12 +203,14 @@ udev_id.push_front(tmp); } } + y2mil("id:" << udev_id); + PartPair pp = partPair(); for( PartIter p=pp.begin(); p!=pp.end(); ++p ) { p->addUdevData(); } - } +} unsigned long long Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?rev=50201&r1=50200&r2=50201&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Tue Aug 19 13:42:28 2008 @@ -58,7 +58,7 @@ void triggerUdevUpdate(); static bool needP( const string& dev ); - void setUdevData( const string& path, const string& id ); + void setUdevData(const string& path, const list<string>& id); virtual int createPartition( storage::PartitionType type, long unsigned start, long unsigned len, string& device, bool checkRelaxed=false ); Modified: trunk/storage/libstorage/src/DmPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.h?rev=50201&r1=50200&r2=50201&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.h (original) +++ trunk/storage/libstorage/src/DmPartCo.h Tue Aug 19 13:42:28 2008 @@ -33,7 +33,7 @@ unsigned numPartitions() const { return disk->numPartitions(); } static storage::CType staticType() { return storage::DMRAID; } friend std::ostream& operator<< (std::ostream&, const DmPartCo& ); - void setUdevData( const string& id ); + void setUdevData(const list<string>& id); int createPartition( storage::PartitionType type, long unsigned start, long unsigned len, string& device, Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=50201&r1=50200&r2=50201&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Aug 19 13:42:28 2008 @@ -759,7 +759,7 @@ { if( i->d ) { - i->d->setUdevData( by_path[i->dev], by_id[i->dev] ); + i->d->setUdevData( by_path[i->dev], splitString(by_id[i->dev])); addToList( i->d ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org