Author: aschnell Date: Wed Nov 9 16:09:49 2011 New Revision: 66781 URL: http://svn.opensuse.org/viewcvs/yast?rev=66781&view=rev Log: - improved multipath parser (see bnc#727428) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmmultipathCo.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmmultipathCo.cc?rev=66781&r1=66780&r2=66781&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmmultipathCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmmultipathCo.cc Wed Nov 9 16:09:49 2011 @@ -48,6 +48,8 @@ if (c.retcode() != 0 || c.numLines() == 0) return; + Regex lun("[[:digit:]]+:[[:digit:]]+:[[:digit:]]+:[[:digit:]]+"); + const vector<string>& lines = c.stdout(); vector<string>::const_iterator it1 = lines.begin(); @@ -80,8 +82,7 @@ if (it1->empty() || isalnum((*it1)[0])) break; - if (boost::starts_with(*it1, "| `-") || boost::starts_with(*it1, " `-") || - boost::starts_with(*it1, " |-")) + if (lun.match(*it1)) { string tmp = it1->substr(5); y2mil("mp element:" << tmp); Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=66781&r1=66780&r2=66781&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Nov 9 16:09:49 2011 @@ -3,6 +3,7 @@ - avoid detection on volumes on disk used by other stuff (bnc#729155) - fixed NFS detection (bnc#729155) +- improved multipath parser (see bnc#727428) ------------------------------------------------------------------- Mon Nov 7 11:46:45 CET 2011 - fehr@suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org