Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-04-14 10:33:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2013-04-03 12:58:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-04-14 10:33:58.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 28 12:38:07 CET 2013 - [email protected] + +- fix bug while formatting as btrfs after resizing (bnc#812162) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.23.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.10/storage/Volume.cc new/libstorage-2.23.10/storage/Volume.cc --- old/libstorage-2.23.10/storage/Volume.cc 2013-03-26 17:31:39.000000000 +0100 +++ new/libstorage-2.23.10/storage/Volume.cc 2013-04-04 15:36:33.000000000 +0200 @@ -1603,6 +1603,7 @@ int Volume::resizeFs() { + y2mil( "vol:" << *this ); SystemCmd c; string cmd; int ret = 0; @@ -1612,7 +1613,14 @@ cmd += dmcrypt_dev.substr(dmcrypt_dev.rfind( '/' )+1); c.execute( cmd ); } - if( !format && !ignore_fs ) + bool needFsResize = !format && !ignore_fs; + if( needFsResize && isUsedBy(UB_BTRFS) ) + { + const Volume *bvol=NULL; + if( getStorage()->findUuid( getUsedBy().front().device(), bvol )) + needFsResize = !bvol->getFormat() && !bvol->ignoreFs(); + } + if( needFsResize ) { switch( fs ) { @@ -1741,7 +1749,7 @@ } } ignore_fs = false; - y2mil("ret:" << ret); + y2mil( "ret:" << ret << " needFsResize:" << needFsResize ); return( ret ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.10/storage/gen_md5sum.cc new/libstorage-2.23.10/storage/gen_md5sum.cc --- old/libstorage-2.23.10/storage/gen_md5sum.cc 2013-03-26 17:37:18.000000000 +0100 +++ new/libstorage-2.23.10/storage/gen_md5sum.cc 2013-04-04 15:43:04.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "335f8c05b705c53cd8d932fc78650114" -#define SOURCES_MD5_DATE " Tue Mar 26 17:37:18 CET 2013 " +#define SOURCES_MD5SUM "5e5223261fe93c2e45f4902531e61eeb" +#define SOURCES_MD5_DATE " Thu Apr 4 15:43:04 CEST 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
