Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-06-18 10:59:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-02 07:00:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-06-18 10:59:36.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 11 13:11:19 CEST 2014 - [email protected] + +- Print different messages for msdos and gpt PReP partitions +- 2.25.14 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.13.tar.bz2 New: ---- libstorage-2.25.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.LXhwY5/_old 2014-06-18 10:59:37.000000000 +0200 +++ /var/tmp/diff_new_pack.LXhwY5/_new 2014-06-18 10:59:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.13 +Version: 2.25.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.25.13.tar.bz2 -> libstorage-2.25.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/Makefile.in new/libstorage-2.25.14/Makefile.in --- old/libstorage-2.25.13/Makefile.in 2014-05-26 15:28:02.000000000 +0200 +++ new/libstorage-2.25.14/Makefile.in 2014-06-11 14:23:00.000000000 +0200 @@ -86,8 +86,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/libstorage.spec.in AUTHORS \ - COPYING config.guess config.sub depcomp install-sh missing \ - py-compile ltmain.sh + COPYING config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/VERSION new/libstorage-2.25.14/VERSION --- old/libstorage-2.25.13/VERSION 2014-05-21 11:56:21.000000000 +0200 +++ new/libstorage-2.25.14/VERSION 2014-06-11 14:18:39.000000000 +0200 @@ -1 +1 @@ -2.25.13 +2.25.14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/storage/Dm.h new/libstorage-2.25.14/storage/Dm.h --- old/libstorage-2.25.13/storage/Dm.h 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.14/storage/Dm.h 2014-06-11 14:18:39.000000000 +0200 @@ -64,7 +64,7 @@ void getTableInfo(); virtual bool checkConsistency() const; unsigned stripes() const { return stripe; } - unsigned setStripes( unsigned long val ) { return stripe=val; } + void setStripes(unsigned long val) { stripe = val; } unsigned long long stripeSize() const { return stripe_size; } void setStripeSize( unsigned long long val ) { stripe_size=val; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/storage/SystemInfo/CmdParted.cc new/libstorage-2.25.14/storage/SystemInfo/CmdParted.cc --- old/libstorage-2.25.13/storage/SystemInfo/CmdParted.cc 2014-05-15 21:09:21.000000000 +0200 +++ new/libstorage-2.25.14/storage/SystemInfo/CmdParted.cc 2014-06-11 14:18:39.000000000 +0200 @@ -125,24 +125,24 @@ scanSecEntryLine(*it); } } - } - iterator prev = entries.begin(); - iterator it = prev; - if( it!=entries.end()) - ++it; - while(it!=entries.end()) + 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 ) + 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 ); + 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; + prev = it; + ++it; } + } y2mil(*this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/storage/Volume.cc new/libstorage-2.25.14/storage/Volume.cc --- old/libstorage-2.25.13/storage/Volume.cc 2014-05-20 10:05:41.000000000 +0200 +++ new/libstorage-2.25.14/storage/Volume.cc 2014-06-11 14:58:30.000000000 +0200 @@ -3324,11 +3324,17 @@ // %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 (p && (p->id() == (Partition::ID_PPC_PREP) || p->id() == Partition::ID_GPT_PREP)) + else if (p && p->id() == Partition::ID_PPC_PREP) { // 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 PPC PReP volume %1$s (%2$s)"), dev.c_str(), sizeString().c_str()); + txt = sformat(_("Create PReP volume %1$s (%2$s)"), dev.c_str(), sizeString().c_str()); + } + else if (p && p->id() == Partition::ID_GPT_PREP) + { + // 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 GPT PReP volume %1$s (%2$s)"), dev.c_str(), sizeString().c_str()); } else if (encryption == ENC_NONE) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/storage/gen_md5sum.cc new/libstorage-2.25.14/storage/gen_md5sum.cc --- old/libstorage-2.25.13/storage/gen_md5sum.cc 2014-05-26 15:27:50.000000000 +0200 +++ new/libstorage-2.25.14/storage/gen_md5sum.cc 2014-06-11 15:02:56.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "45fc7a300b4020cabf6da6d5c17dd976" -#define SOURCES_MD5_DATE " Mon 26 May 15:27:50 CEST 2014 " +#define SOURCES_MD5SUM "4d275f7ecc978acd669c977c15f199f5" +#define SOURCES_MD5_DATE " Wed Jun 11 15:02:56 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/testsuite/parted.cc new/libstorage-2.25.14/testsuite/parted.cc --- old/libstorage-2.25.13/testsuite/parted.cc 2014-03-06 17:30:22.000000000 +0100 +++ new/libstorage-2.25.14/testsuite/parted.cc 2014-06-11 14:18:39.000000000 +0200 @@ -124,6 +124,38 @@ } +void +parse4() +{ + cout << "parse4" << endl; + + vector<string> lines = { + "Model: Maxtor 6 Y080L0 (scsi)", + "Disk /dev/sdb: 9964cyl", + "Sector size (logical/physical): 512B/512B", + "BIOS cylinder,head,sector geometry: 9964,255,63. Each cylinder is 8225kB.", + "Partition Table: loop", + "", + "Number Start End Size File system Flags", + " 1 0cyl 9964cyl 9964cyl xfs", + "", + "Model: Maxtor 6 Y080L0 (scsi)", + "Disk /dev/sdb: 160086528s", + "Sector size (logical/physical): 512B/512B", + "Partition Table: loop", + "", + "Number Start End Size File system Flags", + " 1 0s 160086527s 160086528s xfs", + "" + }; + + Parted parted("/dev/sdb", false); + parted.parse(lines); + + cout << parted << endl; +} + + int main() { @@ -134,4 +166,5 @@ parse1(); parse2(); parse3(); + parse4(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.13/testsuite/single.out/parted.out new/libstorage-2.25.14/testsuite/single.out/parted.out --- old/libstorage-2.25.13/testsuite/single.out/parted.out 2014-03-18 16:59:03.000000000 +0100 +++ new/libstorage-2.25.14/testsuite/single.out/parted.out 2014-06-11 14:18:39.000000000 +0200 @@ -18,3 +18,6 @@ num:2 cylRegion:[23304,2280] secRegion:[4194720,410400] type:primary id:131 num:3 cylRegion:[25584,152495] secRegion:[4605120,27449280] type:primary id:131 +parse4 +device:/dev/sdb label:loop geometry:[9964,255,63,512] + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
