Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at 2014-09-28 19:56:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-24
13:09:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes
2014-09-28 19:56:49.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 25 16:20:52 CEST 2014 - aschn...@suse.de
+
+- sort partitions after certain remove steps (bsc#898362)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-2.25.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.15/storage/BtrfsCo.cc
new/libstorage-2.25.15/storage/BtrfsCo.cc
--- old/libstorage-2.25.15/storage/BtrfsCo.cc 2014-07-21 15:21:12.000000000
+0200
+++ new/libstorage-2.25.15/storage/BtrfsCo.cc 2014-09-25 16:39:17.000000000
+0200
@@ -418,7 +418,7 @@
int BtrfsCo::removeVolume( Volume* v, bool quiet )
{
int ret = 0;
- y2mil("qiet:" << quiet);
+ y2mil("quiet:" << quiet);
y2mil("vol:" << *v);
v->setDeleted();
if( quiet )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.15/storage/Disk.cc
new/libstorage-2.25.15/storage/Disk.cc
--- old/libstorage-2.25.15/storage/Disk.cc 2014-09-22 16:59:15.000000000
+0200
+++ new/libstorage-2.25.15/storage/Disk.cc 2014-09-25 16:39:17.000000000
+0200
@@ -1387,11 +1387,21 @@
return( ret );
}
-static bool volume_ptr_sort_nr( Partition*& rhs, Partition*& lhs )
+
+ static bool
+ partition_ptr_sort_nr(Partition*& rhs, Partition*& lhs)
+ {
+ return rhs->nr() < lhs->nr();
+ }
+
+
+ static bool
+ volume_ptr_sort_nr(const Volume* rhs, const Volume* lhs)
{
- return( rhs->nr()<lhs->nr() );
+ return rhs->nr() < lhs->nr();
}
+
int Disk::removePartition( unsigned nr )
{
y2mil("begin nr " << nr);
@@ -1444,7 +1454,7 @@
}
if( !l.empty() )
{
- l.sort( volume_ptr_sort_nr );
+ l.sort(partition_ptr_sort_nr);
unsigned old = nr;
list<Partition*>::iterator vi = l.begin();
while( vi!=l.end() )
@@ -1454,6 +1464,8 @@
old = save;
++vi;
}
+ // bsc #898362
+ vols.sort(volume_ptr_sort_nr);
}
}
if( t==EXTENDED )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.15/storage/TmpfsCo.cc
new/libstorage-2.25.15/storage/TmpfsCo.cc
--- old/libstorage-2.25.15/storage/TmpfsCo.cc 2014-03-06 17:30:22.000000000
+0100
+++ new/libstorage-2.25.15/storage/TmpfsCo.cc 2014-09-25 16:39:17.000000000
+0200
@@ -121,7 +121,7 @@
int TmpfsCo::removeVolume( Volume* v, bool quiet )
{
int ret = 0;
- y2mil("qiet:" << quiet);
+ y2mil("quiet:" << quiet);
y2mil("vol:" << *v);
v->setDeleted();
if( quiet )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.15/storage/gen_md5sum.cc
new/libstorage-2.25.15/storage/gen_md5sum.cc
--- old/libstorage-2.25.15/storage/gen_md5sum.cc 2014-09-22
17:00:20.000000000 +0200
+++ new/libstorage-2.25.15/storage/gen_md5sum.cc 2014-09-25
16:40:11.000000000 +0200
@@ -1,5 +1,5 @@
-#define SOURCES_MD5SUM "fee924f98da527cdda90876545c2b3d9"
-#define SOURCES_MD5_DATE " Mon Sep 22 17:00:20 CEST 2014 "
+#define SOURCES_MD5SUM "159252ac4b2837ecf24dec15944af9e1"
+#define SOURCES_MD5_DATE " Thu 25 Sep 16:40:11 CEST 2014 "
namespace storage
{
const char* GetSourceMd5() { return SOURCES_MD5SUM; }
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
