Author: fehr Date: Thu Apr 5 14:57:15 2012 New Revision: 67865 URL: http://svn.opensuse.org/viewcvs/yast?rev=67865&view=rev Log: cope with vg and lv names containg '-' Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc?rev=67865&r1=67864&r2=67865&view=diff ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc Thu Apr 5 14:57:15 2012 @@ -295,10 +295,11 @@ on.erase( on.size()-4 ); if( delim.match( on ) ) { - string devname = "/dev/" + on.substr( 0, delim.so(0)+1 ) + - "/" + on.substr( delim.eo(0)-1 ); - skip = getStorage()->knownDevice( devname ); - y2mil( "devname:" << devname << " skip:" << skip ); + on[delim.so(0)+1] = '/'; + boost::replace_all(on,"--","-"); + on = "/dev/" + on; + skip = getStorage()->knownDevice( on ); + y2mil( "devname:" << on << " skip:" << skip ); } } if (!skip && m->sizeK()>0 && !only_crypt ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org