Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-07-29 16:47:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2014-07-27 08:25:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-07-29 16:48:02.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 28 13:45:41 CEST 2014 - [email protected] + +- fixed used-by information for multipath with LVM (bnc#888838) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/DmPartCo.cc new/libstorage-2.25.14/storage/DmPartCo.cc --- old/libstorage-2.25.14/storage/DmPartCo.cc 2014-03-11 15:00:47.000000000 +0100 +++ new/libstorage-2.25.14/storage/DmPartCo.cc 2014-07-28 13:53:54.000000000 +0200 @@ -102,7 +102,6 @@ } addToList( dm ); } - handleWholeDevice(); } y2mil("device:" << device << " ret:" << ret); return ret; @@ -189,7 +188,6 @@ ret = DMPART_PARTITION_NOT_FOUND; ++vi; } - handleWholeDevice(); return( ret ); } @@ -365,55 +363,9 @@ addToList( p ); ++i; } - handleWholeDevice(si); } -void DmPartCo::handleWholeDevice() - { - Disk::PartPair pp = disk->partPair( Partition::notDeleted ); - y2mil("empty:" << pp.empty()); - if( pp.empty() ) - { - DmPart * p = NULL; - newP( p, 0, NULL ); - p->setSize( size_k ); - addToList( p ); - } - else - { - DmPartIter i; - if( findDm( 0, i )) - { - DmPart* dm = &(*i); - if( !removeFromList( dm )) - y2err( "not found:" << *i ); - } - } - } - -void DmPartCo::handleWholeDevice(SystemInfo& si) - { - Disk::PartPair pp = disk->partPair( Partition::notDeleted ); - y2mil("empty:" << pp.empty()); - if( pp.empty() ) - { - DmPart * p = NULL; - newP( p, 0, NULL, si ); - p->setSize( size_k ); - addToList( p ); - } - else - { - DmPartIter i; - if( findDm( 0, i )) - { - DmPart* dm = &(*i); - if( !removeFromList( dm )) - y2err( "not found:" << *i ); - } - } - } - + Partition* DmPartCo::getPartition( unsigned nr, bool del ) { @@ -636,7 +588,6 @@ if( ret==0 ) { removeFromMemory(); - handleWholeDevice(); Storage::waitForDevice(); } y2mil("ret:" << ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/DmPartCo.h new/libstorage-2.25.14/storage/DmPartCo.h --- old/libstorage-2.25.14/storage/DmPartCo.h 2014-02-20 16:09:58.000000000 +0100 +++ new/libstorage-2.25.14/storage/DmPartCo.h 2014-07-28 13:53:54.000000000 +0200 @@ -176,8 +176,6 @@ virtual void newP( DmPart*& dm, unsigned num, Partition* p ); int addNewDev( string& device ); int updateDelDev(); - void handleWholeDevice(); - void handleWholeDevice(SystemInfo& si); void removeFromMemory(); void removePresentPartitions(); bool validPartition( const Partition* p ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/MdPartCo.cc new/libstorage-2.25.14/storage/MdPartCo.cc --- old/libstorage-2.25.14/storage/MdPartCo.cc 2014-03-13 14:54:46.000000000 +0100 +++ new/libstorage-2.25.14/storage/MdPartCo.cc 2014-07-28 13:53:54.000000000 +0200 @@ -175,7 +175,6 @@ y2mil("device:" << device << " was added to MdPartCo : " << dev); } - handleWholeDevice(); } if( ret != 0 ) { @@ -272,7 +271,6 @@ ret = MDPART_PARTITION_NOT_FOUND; ++vi; } - handleWholeDevice(); return( ret ); } @@ -421,32 +419,8 @@ addToList( p ); ++i; } - handleWholeDevice(); } -void MdPartCo::handleWholeDevice() - { - Disk::PartPair pp = disk->partPair( Partition::notDeleted ); - y2mil("empty:" << pp.empty()); - - if( pp.empty() ) - { - MdPart * p = NULL; - newP( p, 0, NULL ); - p->setSize( size_k ); - addToList( p ); - } - else - { - MdPartIter i; - if( findMdPart( 0, i )) - { - MdPart* md = &(*i); - if( !removeFromList( md )) - y2err( "not found:" << *i ); - } - } - } Partition* MdPartCo::getPartition( unsigned nr, bool del ) @@ -677,7 +651,6 @@ if( ret==0 ) { removeFromMemory(); - handleWholeDevice(); getStorage()->waitForDevice(); } y2mil("ret:" << ret); @@ -711,16 +684,6 @@ } } - //Remove 'whole device' it was created when last partition was deleted. - p=mdpartPair(MdPart::notDeleted); - if( p.begin()!=p.end() && p.begin()->nr()==0 ) - { - if( !removeFromList( &(*p.begin()) )) - { - y2err( "not found:" << *p.begin() ); - ret = MDPART_PARTITION_NOT_FOUND; - } - } } if( ret==0 ) { @@ -919,23 +882,8 @@ // 2. Check for partitions. if( disk!=NULL && disk->numPartitions()>0 ) { - int permitRemove=1; - //handleWholeDevice: partition 0. - if( disk->numPartitions() == 1 ) - { - //Find partition '0' if it exists then this 'whole device' - MdPartIter i; - if( findMdPart( 0, i ) == true) - { - //Single case when removal is allowed. - permitRemove = 0; - } - } - if( permitRemove == 1 ) - { y2err("Cannot remove RAID with partitions."); - return (MDPART_NO_REMOVE); - } + return MDPART_NO_REMOVE; } /* Try to remove this. */ y2mil("Raid:" << name() << " is going to be removed permanently"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/MdPartCo.h new/libstorage-2.25.14/storage/MdPartCo.h --- old/libstorage-2.25.14/storage/MdPartCo.h 2014-02-20 16:09:58.000000000 +0100 +++ new/libstorage-2.25.14/storage/MdPartCo.h 2014-07-28 13:53:54.000000000 +0200 @@ -221,7 +221,6 @@ virtual void newP( MdPart*& dm, unsigned num, Partition* p ); int addNewDev( string& device ); int updateDelDev(); - void handleWholeDevice(); void removeFromMemory(); void removePresentPartitions(); bool validPartition( const Partition* p ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/gen_md5sum.cc new/libstorage-2.25.14/storage/gen_md5sum.cc --- old/libstorage-2.25.14/storage/gen_md5sum.cc 2014-07-21 15:21:54.000000000 +0200 +++ new/libstorage-2.25.14/storage/gen_md5sum.cc 2014-07-28 13:54:35.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "b196a2af6a6fc3ccaf2da7838978a702" -#define SOURCES_MD5_DATE " Mon 21 Jul 15:21:54 CEST 2014 " +#define SOURCES_MD5SUM "03b8224ca55ef21d19a70a69ad8a1f02" +#define SOURCES_MD5_DATE " Mon 28 Jul 13:54:35 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
