Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-10-20 10:52:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-10-03 07:25:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-10-20 10:52:50.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Oct 15 10:23:49 CEST 2013 - aschn...@suse.de + +- fixed calculation of free physical extents (bnc#844534) + +------------------------------------------------------------------- +Mon Oct 14 12:28:38 CEST 2013 - aschn...@suse.de + +- changed default mount-by to uuid (fate#316204) + +------------------------------------------------------------------- +Fri Oct 11 14:26:18 CEST 2013 - aschn...@suse.de + +- adapted to device-mapper device name changes (bnc#810840) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ +++ empty output from diff against libstorage.spec ++++++ libstorage-2.25.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/data/sysconfig.storage-libstorage new/libstorage-2.25.0/data/sysconfig.storage-libstorage --- old/libstorage-2.25.0/data/sysconfig.storage-libstorage 2013-09-25 18:41:29.000000000 +0200 +++ new/libstorage-2.25.0/data/sysconfig.storage-libstorage 2013-10-14 11:17:15.000000000 +0200 @@ -2,7 +2,7 @@ ## Type: string(id,path,device,uuid,label) # Default mount-by method. -DEVICE_NAMES="id" +DEVICE_NAMES="uuid" ## Type: string(ext2,ext3,ext4,xfs,btrfs) # Default filesystem type. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/libstorage.spec.in new/libstorage-2.25.0/libstorage.spec.in --- old/libstorage-2.25.0/libstorage.spec.in 2013-09-30 17:57:27.000000000 +0200 +++ new/libstorage-2.25.0/libstorage.spec.in 2013-10-01 18:12:29.000000000 +0200 @@ -87,9 +87,9 @@ %{find_lang} libstorage -rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libstorage.a +rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libstorage.a rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libstorage.la -%if 0%{?suse_version} +%if 0%{?suse_version} %if "%{?rb_vendorarchdir}" != "" rm -f $RPM_BUILD_ROOT/%{rb_vendorarchdir}/storage.la %else @@ -209,7 +209,7 @@ %files -n libstorage-ruby %defattr(-,root,root) -%if 0%{?suse_version} +%if 0%{?suse_version} %if "%{?rb_vendorarchdir}" != "" %{rb_vendorarchdir}/storage.so %else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/Disk.cc new/libstorage-2.25.0/storage/Disk.cc --- old/libstorage-2.25.0/storage/Disk.cc 2013-09-10 12:02:03.000000000 +0200 +++ new/libstorage-2.25.0/storage/Disk.cc 2013-10-11 14:31:39.000000000 +0200 @@ -754,7 +754,7 @@ { // TODO: this is hackish if (boost::starts_with(disk, "/dev/mapper/")) - return "_part"; + return "-part"; else if (needP(disk)) return "p"; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/DmPartCo.cc new/libstorage-2.25.0/storage/DmPartCo.cc --- old/libstorage-2.25.0/storage/DmPartCo.cc 2013-09-27 14:09:14.000000000 +0200 +++ new/libstorage-2.25.0/storage/DmPartCo.cc 2013-10-11 14:31:39.000000000 +0200 @@ -72,7 +72,7 @@ { int ret = 0; y2mil("device:" << device << " dev:" << dev); - string::size_type pos = device.rfind("_part"); + string::size_type pos = device.rfind("-part"); if (pos == string::npos) ret = DMPART_PARTITION_NOT_FOUND; else @@ -472,7 +472,7 @@ string ret = nm; if( num>0 ) { - ret += "_part"; + ret += "-part"; ret += decString(num); } y2mil( "num:" << num << " ret:" << ret ); @@ -486,7 +486,7 @@ string ret = dev; if( num>0 ) { - ret += "_part"; + ret += "-part"; ret += decString(num); } y2mil( "num:" << num << " ret:" << ret ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/DmraidCo.cc new/libstorage-2.25.0/storage/DmraidCo.cc --- old/libstorage-2.25.0/storage/DmraidCo.cc 2013-08-12 17:43:49.000000000 +0200 +++ new/libstorage-2.25.0/storage/DmraidCo.cc 2013-10-11 14:31:39.000000000 +0200 @@ -209,7 +209,7 @@ } else { - c.execute(DMRAIDBIN " -an -P _part"); + c.execute(DMRAIDBIN " -an"); } active = val; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/LvmVg.cc new/libstorage-2.25.0/storage/LvmVg.cc --- old/libstorage-2.25.0/storage/LvmVg.cc 2013-09-24 17:03:56.000000000 +0200 +++ new/libstorage-2.25.0/storage/LvmVg.cc 2013-10-15 10:25:28.000000000 +0200 @@ -215,7 +215,7 @@ { Pv pvn; unsigned long long s = getStorage()->deviceSize( d ); - pe = (s - 500)/pe_size; + pe = (s - 4000)/pe_size; pvn.num_pe = pvn.free_pe = pe; pvn.device = d; @@ -992,7 +992,7 @@ if( addLvPeDistribution( i->getLe(), i->stripes(), pv, pv_add, pe_map ) == 0 ) i->setPeMap( pe_map ); - free_pe -= i->getLe(); + free_pe -= min((unsigned long long) free_pe, i->getLe()); } } p=lvmLvPair(lvResized); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/Parted.cc new/libstorage-2.25.0/storage/Parted.cc --- old/libstorage-2.25.0/storage/Parted.cc 2012-11-12 10:39:16.000000000 +0100 +++ new/libstorage-2.25.0/storage/Parted.cc 2013-10-11 14:31:27.000000000 +0200 @@ -90,6 +90,22 @@ y2mil("device:" << device << " label:" << label << " geometry:" << geometry << " gpt_enlarge:" << gpt_enlarge); + iterator prev = entries.begin(); + iterator it = prev; + if( it!=entries.end()) + ++it; + while(it!=entries.end()) + { + if( prev->cylRegion.start()>=it->cylRegion.start() && it->cylRegion.len()>0 ) + { + y2mil("old:" << it->cylRegion ); + it->cylRegion.setStart(it->cylRegion.start()+1); + it->cylRegion.setLen(it->cylRegion.len()-1); + y2mil("new:" << it->cylRegion ); + } + prev = it; + ++it; + } for (const_iterator it = entries.begin(); it != entries.end(); ++it) y2mil(*it); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/Volume.cc new/libstorage-2.25.0/storage/Volume.cc --- old/libstorage-2.25.0/storage/Volume.cc 2013-09-25 18:41:36.000000000 +0200 +++ new/libstorage-2.25.0/storage/Volume.cc 2013-10-14 11:17:42.000000000 +0200 @@ -325,6 +325,9 @@ { MountByType mby = getStorage()->getDefaultMountBy(); + if (mby == MOUNTBY_UUID && cType() == LVM) + mby = MOUNTBY_DEVICE; + if (!allowedMountBy(mby)) mby = MOUNTBY_DEVICE; @@ -3286,7 +3289,14 @@ } else { - if (encryption == ENC_NONE) + const Partition* p = dynamic_cast<const Partition*>(this); + if (p && p->id()==Partition::ID_GPT_BIOS) + { + // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 + // %2$s is replaced by size (e.g. 623.5 MB) + txt = sformat(_("Create BIOS grub volume %1$s (%2$s)"), dev.c_str(), sizeString().c_str()); + } + else if (encryption == ENC_NONE) { // displayed text before action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by size (e.g. 623.5 MB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/storage/gen_md5sum.cc new/libstorage-2.25.0/storage/gen_md5sum.cc --- old/libstorage-2.25.0/storage/gen_md5sum.cc 2013-09-30 11:28:53.000000000 +0200 +++ new/libstorage-2.25.0/storage/gen_md5sum.cc 2013-10-15 10:25:29.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "973dc07d30cbbc7942ffd98a53ee50d3" -#define SOURCES_MD5_DATE " Mon 30 Sep 11:28:54 CEST 2013 " +#define SOURCES_MD5SUM "e219926a90188a93eb65c7cd97496336" +#define SOURCES_MD5_DATE " Tue 15 Oct 10:25:29 CEST 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/testsuite/partitionprefix.cc new/libstorage-2.25.0/testsuite/partitionprefix.cc --- old/libstorage-2.25.0/testsuite/partitionprefix.cc 2012-08-07 11:51:00.000000000 +0200 +++ new/libstorage-2.25.0/testsuite/partitionprefix.cc 2013-10-11 14:31:39.000000000 +0200 @@ -22,7 +22,7 @@ cout << s->getPartitionPrefix("/dev/mmcblk0") << endl; cout << s->getPartitionPrefix("/dev/mmcblk0p3") << endl; cout << s->getPartitionPrefix("/dev/mapper/isw_cfcjajfdfh_test") << endl; - cout << s->getPartitionPrefix("/dev/mapper/isw_cfcjajfdfh_test_part4") << endl; + cout << s->getPartitionPrefix("/dev/mapper/isw_cfcjajfdfh_test-part4") << endl; delete s; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/testsuite/single.out/partitionname.out new/libstorage-2.25.0/testsuite/single.out/partitionname.out --- old/libstorage-2.25.0/testsuite/single.out/partitionname.out 2012-08-07 11:51:00.000000000 +0200 +++ new/libstorage-2.25.0/testsuite/single.out/partitionname.out 2013-10-11 14:31:39.000000000 +0200 @@ -1,5 +1,5 @@ /dev/sda1 /dev/cciss/c0d1p2 /dev/mmcblk0p3 -/dev/mapper/isw_cfcjajfdfh_test_part4 +/dev/mapper/isw_cfcjajfdfh_test-part4 /dev/md2p5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/testsuite/single.out/partitionprefix.out new/libstorage-2.25.0/testsuite/single.out/partitionprefix.out --- old/libstorage-2.25.0/testsuite/single.out/partitionprefix.out 2012-08-07 11:51:00.000000000 +0200 +++ new/libstorage-2.25.0/testsuite/single.out/partitionprefix.out 2013-10-11 14:31:39.000000000 +0200 @@ -4,5 +4,5 @@ p p p -_part -_part +-part +-part -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org