Author: fehr Date: Mon Nov 7 11:57:20 2011 New Revision: 66735 URL: http://svn.opensuse.org/viewcvs/yast?rev=66735&view=rev Log: - version 2.17.121 - fix crash when deleting multipath volumes (bnc#725695) Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/VERSION?rev=66735&r1=66734&r2=66735&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Mon Nov 7 11:57:20 2011 @@ -1 +1 @@ -2.17.120 +2.17.121 Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc?rev=66735&r1=66734&r2=66735&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Mon Nov 7 11:57:20 2011 @@ -988,27 +988,7 @@ ConstContIterator cont; ConstVolIterator vol; - if (findContainer(device, cont)) - { - Container::ConstVolPair p = cont->volPair(Volume::notDeleted); - for( Container::ConstVolIterator it = p.begin(); it != p.end(); ++it ) - { - addIfNotThere( devices, it->device() ); - getRecursiveUsingHelper(it->device(), devices); - } - - if (cont->isUsedBy()) - { - const list<UsedBy> usedBy = cont->getUsedBy(); - for( list<UsedBy>::const_iterator it = usedBy.begin(); - it != usedBy.end(); ++it) - { - addIfNotThere( devices, it->device() ); - getRecursiveUsingHelper(it->device(), devices); - } - } - } - else if (findVolume(device, vol)) + if (findVolume(device, vol)) { if (vol->isUsedBy()) { @@ -1091,6 +1071,26 @@ getRecursiveUsingHelper(*i, devices); } } + else if (findContainer(device, cont)) + { + Container::ConstVolPair p = cont->volPair(Volume::notDeleted); + for( Container::ConstVolIterator it = p.begin(); it != p.end(); ++it ) + { + addIfNotThere( devices, it->device() ); + getRecursiveUsingHelper(it->device(), devices); + } + + if (cont->isUsedBy()) + { + const list<UsedBy> usedBy = cont->getUsedBy(); + for( list<UsedBy>::const_iterator it = usedBy.begin(); + it != usedBy.end(); ++it) + { + addIfNotThere( devices, it->device() ); + getRecursiveUsingHelper(it->device(), devices); + } + } + } else { ret = STORAGE_DEVICE_NOT_FOUND; 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=66735&r1=66734&r2=66735&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 Mon Nov 7 11:57:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 7 11:46:45 CET 2011 - fehr@suse.de + +- version 2.17.121 +- fix crash when deleting multipath volumes (bnc#725695) + +------------------------------------------------------------------- Thu Nov 3 10:55:36 CET 2011 - fehr@suse.de - version 2.17.120 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org