Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2011-11-08 17:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2011-11-05 11:49:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2011-11-08 17:43:41.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 7 11:46:45 CET 2011 - fehr@suse.de + +- 2.21.15 +- fix crash when deleting multipath volumes (bnc#725695) + +------------------------------------------------------------------- Old: ---- libstorage-2.21.14.tar.bz2 New: ---- libstorage-2.21.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.nnXUeF/_old 2011-11-08 17:43:46.000000000 +0100 +++ /var/tmp/diff_new_pack.nnXUeF/_new 2011-11-08 17:43:46.000000000 +0100 @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.21.14 +Version: 2.21.15 Release: 0 License: GPL Group: System/Libraries ++++++ libstorage-2.21.14.tar.bz2 -> libstorage-2.21.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.14/VERSION new/libstorage-2.21.15/VERSION --- old/libstorage-2.21.14/VERSION 2011-11-03 16:49:19.000000000 +0100 +++ new/libstorage-2.21.15/VERSION 2011-11-08 11:42:24.000000000 +0100 @@ -1 +1 @@ -2.21.14 +2.21.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.21.14/storage/Storage.cc new/libstorage-2.21.15/storage/Storage.cc --- old/libstorage-2.21.14/storage/Storage.cc 2011-11-03 10:40:00.000000000 +0100 +++ new/libstorage-2.21.15/storage/Storage.cc 2011-11-07 11:58:34.000000000 +0100 @@ -985,27 +985,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()) { @@ -1088,6 +1068,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; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org