Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-02-08 07:12:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-12-21 10:17:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-02-08 07:12:18.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Jan 29 10:21:10 CET 2013 - fehr@suse.de + +- version 2.23.4 +- fixed wrong display of fs type when formatting btrfs (bnc#799897) + +------------------------------------------------------------------- +Fri Jan 04 10:36:36 CET 2013 - aschnell@suse.de + +- do not resize filesystem if enlarging partition failed + (bnc#796339) + +------------------------------------------------------------------- Old: ---- libstorage-2.23.3.tar.bz2 New: ---- libstorage-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.HZlsDi/_old 2013-02-08 07:12:19.000000000 +0100 +++ /var/tmp/diff_new_pack.HZlsDi/_new 2013-02-08 07:12:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libstorage # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.23.3.tar.bz2 -> libstorage-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.3/VERSION new/libstorage-2.23.4/VERSION --- old/libstorage-2.23.3/VERSION 2012-12-20 12:41:32.000000000 +0100 +++ new/libstorage-2.23.4/VERSION 2013-02-07 15:29:31.000000000 +0100 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.3/storage/Disk.cc new/libstorage-2.23.4/storage/Disk.cc --- old/libstorage-2.23.3/storage/Disk.cc 2012-12-19 12:53:15.000000000 +0100 +++ new/libstorage-2.23.4/storage/Disk.cc 2013-02-05 12:48:51.000000000 +0100 @@ -1093,7 +1093,7 @@ cylinderToKb(len), Region(start, len), type); ConstPartPair pp = partPair(); ConstPartIter i = pp.begin(); - while( i!=pp.end() && !(i->deleted() && i->cylStart()==start) ) + while( i!=pp.end() && !(i->deleted() && i->cylStart()==start && i->type()==type) ) ++i; if( i!=pp.end() ) { @@ -2010,7 +2010,7 @@ if( ret==0 && p->type()!=EXTENDED ) { ret = p->zeroIfNeeded(); - if( !dmp_slave && !p->getFormat() ) + if( !dmp_slave && !p->getFormat() && !p->isUsedBy(UB_BTRFS)) { bool lsave = false; string lbl; @@ -2350,7 +2350,7 @@ Storage::waitForDevice(p->device()); y2mil("after resize size:" << p->sizeK() << " resize:" << (p->needShrink()||p->needExtend())); } - if( needExtend && !dmp_slave && + if( ret == 0 && needExtend && !dmp_slave && p->getFs()!=HFS && p->getFs()!=HFSPLUS && p->getFs()!=VFAT && p->getFs()!=FSNONE ) ret = p->resizeFs(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org