Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2016-10-13 11:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-09-24 15:18:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2016-10-13 11:25:01.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 6 16:00:33 CEST 2016 - shundhammer@suse.de + +- Don't accept 'format' flag if volume is in use (bsc#996007) +- 2.26.10 + +------------------------------------------------------------------- Old: ---- libstorage-2.26.9.tar.bz2 New: ---- libstorage-2.26.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.eff7e4/_old 2016-10-13 11:25:02.000000000 +0200 +++ /var/tmp/diff_new_pack.eff7e4/_new 2016-10-13 11:25:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.26.9 +Version: 2.26.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.26.9.tar.bz2 -> libstorage-2.26.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.9/VERSION new/libstorage-2.26.10/VERSION --- old/libstorage-2.26.9/VERSION 2016-09-22 14:40:09.000000000 +0200 +++ new/libstorage-2.26.10/VERSION 2016-10-10 11:25:15.000000000 +0200 @@ -1 +1 @@ -2.26.9 +2.26.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.9/storage/Btrfs.cc new/libstorage-2.26.10/storage/Btrfs.cc --- old/libstorage-2.26.9/storage/Btrfs.cc 2016-01-18 11:10:13.000000000 +0100 +++ new/libstorage-2.26.10/storage/Btrfs.cc 2016-10-10 11:25:15.000000000 +0200 @@ -97,7 +97,9 @@ Btrfs::Btrfs(const BtrfsCo& c, const Btrfs& v) - : Volume(c, v), devices(v.devices), subvolumes(v.subvolumes) + : Volume(c, v), devices(v.devices) + , dev_add(v.dev_add), dev_rem(v.dev_rem) + , subvolumes(v.subvolumes) { y2deb("copy-constructed Btrfs from " << v.dev); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.9/storage/Volume.cc new/libstorage-2.26.10/storage/Volume.cc --- old/libstorage-2.26.9/storage/Volume.cc 2016-09-07 16:45:12.000000000 +0200 +++ new/libstorage-2.26.10/storage/Volume.cc 2016-10-10 11:25:15.000000000 +0200 @@ -648,8 +648,7 @@ { int ret = 0; y2mil("device:" << dev << " val:" << val << " fs:" << toString(new_fs)); - format = val; - if( !format ) + if( !val ) { fs = detected_fs; mkfs_opt = ""; @@ -691,8 +690,20 @@ uuid.erase(); } } + + if ( ret == 0 ) + { + y2mil("Accepting new format value " << val << " for " << device() + << " ret: " << ret); + format = val; + } + else + { + y2war("REJECTING new format value " << val << " for " << device() + << "; keeping " << format << " ret: " << ret ); + } + y2mil("device:" << *this ); - y2mil("ret:" << ret); return( ret ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.9/storage/gen_md5sum.cc new/libstorage-2.26.10/storage/gen_md5sum.cc --- old/libstorage-2.26.9/storage/gen_md5sum.cc 2016-09-22 14:41:34.000000000 +0200 +++ new/libstorage-2.26.10/storage/gen_md5sum.cc 2016-10-10 11:26:30.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "559e2954574c894dc7dba48006951743" -#define SOURCES_MD5_DATE " Thu Sep 22 12:41:34 UTC 2016 " +#define SOURCES_MD5SUM "19d7d4a96a7d3eb77eb7304883df1289" +#define SOURCES_MD5_DATE " Mon Oct 10 09:26:30 UTC 2016 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; }