Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at 2014-09-07 11:08:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-20
17:54:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes
2014-09-07 11:08:35.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 05 10:35:50 CEST 2014 - aschn...@suse.de
+
+- improved testmode
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-2.25.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.14/storage/Disk.cc
new/libstorage-2.25.14/storage/Disk.cc
--- old/libstorage-2.25.14/storage/Disk.cc 2014-07-16 17:36:34.000000000
+0200
+++ new/libstorage-2.25.14/storage/Disk.cc 2014-09-04 18:18:40.000000000
+0200
@@ -310,7 +310,8 @@
gpt_enlarge = parted.getGptEnlarge();
- y2mil("dlabel:" << dlabel << " geometry:" << geometry << "
gpt_enlarge:" << gpt_enlarge);
+ y2mil("device:" << device() << " dlabel:" << dlabel << " geometry:" <<
geometry <<
+ " gpt_enlarge:" << gpt_enlarge);
if( dlabel!="loop" )
{
@@ -342,9 +343,9 @@
ronly = true;
}
- y2mil("ret:" << ret << " partitions:" << vols.size() << " detected label:"
<< detected_label <<
- " label:" << label);
- return( ret );
+ y2mil("ret:" << ret << " partitions:" << vols.size() << " detected
label:" << detected_label <<
+ " label:" << label << " ronly:" << ronly);
+ return ret;
}
@@ -366,7 +367,8 @@
void
Disk::setLabelData(const string& disklabel)
{
- y2mil("disklabel:" << disklabel);
+ y2mil("device:" << device() << " disklabel:" << disklabel);
+
DlabelCapabilities caps;
if (getDlabelCapabilities(disklabel, caps))
{
@@ -382,8 +384,9 @@
max_logical = 0;
label = "unsupported";
}
- y2mil("label:" << label << " max_primary:" << max_logical << "
ext_possible:" <<
- ext_possible << " max_logical:" << max_logical);
+
+ y2mil("device:" << device() << " label:" << label << " max_primary:" <<
max_logical <<
+ " ext_possible:" << ext_possible << " max_logical:" <<
max_logical);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.14/storage/Dm.cc
new/libstorage-2.25.14/storage/Dm.cc
--- old/libstorage-2.25.14/storage/Dm.cc 2014-07-29 13:55:45.000000000
+0200
+++ new/libstorage-2.25.14/storage/Dm.cc 2014-09-05 10:45:53.000000000
+0200
@@ -109,14 +109,20 @@
}
-unsigned Dm::dmMajor()
+ unsigned
+ Dm::dmMajor(bool testmode)
{
- if( dm_major==0 )
- {
- dm_major = getMajorDevices("device-mapper");
- y2mil("dm_major:" << dm_major);
- }
- return( dm_major );
+ if (dm_major == 0)
+ {
+ if (testmode)
+ dm_major = 253;
+ else
+ dm_major = getMajorDevices("device-mapper");
+
+ y2mil("dm_major:" << dm_major);
+ }
+
+ return dm_major;
}
@@ -233,7 +239,7 @@
void Dm::updateMajorMinor()
{
getMajorMinor();
- if( majorNr()==Dm::dmMajor() )
+ if (majorNr() == Dm::dmMajor(getStorage()->testmode()))
{
string d = "/dev/dm-" + decString(minorNr());
if( d!=dev )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.14/storage/Dm.h
new/libstorage-2.25.14/storage/Dm.h
--- old/libstorage-2.25.14/storage/Dm.h 2014-06-03 18:38:54.000000000 +0200
+++ new/libstorage-2.25.14/storage/Dm.h 2014-09-05 10:45:53.000000000 +0200
@@ -96,7 +96,7 @@
void logDifference(std::ostream& log, const Dm& rhs) const;
- static unsigned dmMajor();
+ static unsigned dmMajor(bool testmode);
static string dmDeviceName( unsigned long num );
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.14/storage/LvmLv.cc
new/libstorage-2.25.14/storage/LvmLv.cc
--- old/libstorage-2.25.14/storage/LvmLv.cc 2014-07-30 09:52:01.000000000
+0200
+++ new/libstorage-2.25.14/storage/LvmLv.cc 2014-09-04 18:18:40.000000000
+0200
@@ -107,8 +107,8 @@
setChildValueIf(node, "used_pool", used_pool, !used_pool.empty());
setChildValueIf(node, "origin", origin, !origin.empty());
- setChildValue(node, "pool", pool);
- setChildValue(node, "chunk_size", chunk_size);
+ setChildValueIf(node, "pool", pool, pool);
+ setChildValueIf(node, "chunk_size", chunk_size, chunk_size != 0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.14/storage/LvmVg.cc
new/libstorage-2.25.14/storage/LvmVg.cc
--- old/libstorage-2.25.14/storage/LvmVg.cc 2014-07-15 09:46:13.000000000
+0200
+++ new/libstorage-2.25.14/storage/LvmVg.cc 2014-09-05 10:45:53.000000000
+0200
@@ -1902,7 +1902,7 @@
void LvmVg::normalizeDmDevices()
{
y2mil( "normalizeDmDevices:" << name() );
- string dm = decString(Dm::dmMajor());
+ string dm = decString(Dm::dmMajor(getStorage()->testmode()));
for( list<Pv>::iterator i=pv.begin(); i!=pv.end(); ++i )
{
if( i->device.find( "/dev/dm-" )==0 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.25.14/storage/gen_md5sum.cc
new/libstorage-2.25.14/storage/gen_md5sum.cc
--- old/libstorage-2.25.14/storage/gen_md5sum.cc 2014-08-15
09:09:55.000000000 +0200
+++ new/libstorage-2.25.14/storage/gen_md5sum.cc 2014-09-05
10:46:52.000000000 +0200
@@ -1,5 +1,5 @@
-#define SOURCES_MD5SUM "fa6313f2133fed3f521b981567f2ee7f"
-#define SOURCES_MD5_DATE " Fri 15 Aug 09:09:55 CEST 2014 "
+#define SOURCES_MD5SUM "df650078fdf78940c0c6128a225b2f0c"
+#define SOURCES_MD5_DATE " Fri 5 Sep 10:46:52 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
