Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-03-01 07:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-02-22 16:53:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-03-01 07:25:43.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 27 18:19:47 CET 2013 - fehr@suse.de + +- version 2.23.8 +- fix handling of inactive raid devices (bnc#798275) + +------------------------------------------------------------------- @@ -13 +19 @@ - /dev/mapper/<dm> + /dev/mapper/<dm> (bnc#805169) Old: ---- libstorage-2.23.7.tar.bz2 New: ---- libstorage-2.23.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.qs5nFl/_old 2013-03-01 07:25:44.000000000 +0100 +++ /var/tmp/diff_new_pack.qs5nFl/_new 2013-03-01 07:25:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.23.7 +Version: 2.23.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.23.7.tar.bz2 -> libstorage-2.23.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/VERSION new/libstorage-2.23.8/VERSION --- old/libstorage-2.23.7/VERSION 2013-02-21 16:25:43.000000000 +0100 +++ new/libstorage-2.23.8/VERSION 2013-02-28 15:36:33.000000000 +0100 @@ -1 +1 @@ -2.23.7 +2.23.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/bindings/python/libstorage.py new/libstorage-2.23.8/bindings/python/libstorage.py --- old/libstorage-2.23.7/bindings/python/libstorage.py 2013-02-21 19:20:06.000000000 +0100 +++ new/libstorage-2.23.8/bindings/python/libstorage.py 2013-02-28 15:44:59.000000000 +0100 @@ -856,6 +856,9 @@ __swig_setmethods__["spares"] = _libstorage.MdInfo_spares_set __swig_getmethods__["spares"] = _libstorage.MdInfo_spares_get if _newclass:spares = _swig_property(_libstorage.MdInfo_spares_get, _libstorage.MdInfo_spares_set) + __swig_setmethods__["inactive"] = _libstorage.MdInfo_inactive_set + __swig_getmethods__["inactive"] = _libstorage.MdInfo_inactive_get + if _newclass:inactive = _swig_property(_libstorage.MdInfo_inactive_get, _libstorage.MdInfo_inactive_set) __swig_destroy__ = _libstorage.delete_MdInfo __del__ = lambda self : None; MdInfo_swigregister = _libstorage.MdInfo_swigregister diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/Md.cc new/libstorage-2.23.8/storage/Md.cc --- old/libstorage-2.23.7/storage/Md.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/Md.cc 2013-02-27 18:26:33.000000000 +0100 @@ -43,7 +43,7 @@ Md::Md(const MdCo& c, const string& name, const string& device, MdType Type, const list<string>& devices, const list<string>& spares) : Volume(c, name, device), md_type(Type), md_parity(PAR_DEFAULT), chunk_k(0), - sb_ver("01.00.00"), destrSb(false), devs(devices), spare(spares), has_container(false) + sb_ver("01.00.00"), destrSb(false), devs(devices), spare(spares), has_container(false), inactive(false) { y2deb("constructed Md " << dev << " on " << cont->device()); @@ -61,7 +61,7 @@ Md::Md(const MdCo& c, const string& name, const string& device, SystemInfo& systeminfo) : Volume(c, name, device, systeminfo), md_type(RAID_UNK), md_parity(PAR_DEFAULT), - chunk_k(0), sb_ver("01.00.00"), destrSb(false), has_container(false) + chunk_k(0), sb_ver("01.00.00"), destrSb(false), has_container(false), inactive(false) { y2deb("constructed Md " << device << " on " << cont->device()); @@ -86,6 +86,8 @@ devs = entry.devices; spare = entry.spares; + inactive = entry.inactive; + if (entry.readonly) setReadonly(); @@ -130,7 +132,8 @@ chunk_k(v.chunk_k), md_uuid(v.md_uuid), md_name(v.md_name), sb_ver(v.sb_ver), destrSb(v.destrSb), devs(v.devs), spare(v.spare), udev_id(udev_id), - has_container(v.has_container), parent_container(v.parent_container), + has_container(v.has_container), inactive(v.inactive), + parent_container(v.parent_container), parent_uuid(v.parent_uuid), parent_md_name(v.parent_md_name), parent_metadata(v.parent_metadata), parent_member(v.parent_member) { @@ -543,6 +546,7 @@ info.sb_ver = sb_ver; info.chunkSizeK = chunk_k; info.parity = md_parity; + info.inactive = inactive; info.devices = boost::join(devs, " "); info.spares = boost::join(spare, " "); @@ -561,6 +565,8 @@ s << " Parity:" << toString(m.md_parity); if( !m.sb_ver.empty() ) s << " SbVer:" << m.sb_ver; + if (m.inactive) + s << " inactive"; if (!m.md_uuid.empty()) s << " md_uuid:" << m.md_uuid; if (!m.md_name.empty()) @@ -579,7 +585,8 @@ return( Volume::equalContent(rhs) && md_type==rhs.md_type && md_parity==rhs.md_parity && chunk_k==rhs.chunk_k && md_uuid==rhs.md_uuid && sb_ver==rhs.sb_ver && - destrSb==rhs.destrSb && devs == rhs.devs && spare==rhs.spare ); + destrSb==rhs.destrSb && devs == rhs.devs && spare==rhs.spare && + inactive==rhs.inactive ); } @@ -592,6 +599,7 @@ logDiffEnum(log, "md_parity", md_parity, rhs.md_parity); logDiff(log, "chunk_k", chunk_k, rhs.chunk_k); logDiff(log, "sb_ver", sb_ver, rhs.sb_ver); + logDiff(log, "inactive", inactive, rhs.inactive); logDiff(log, "md_uuid", md_uuid, rhs.md_uuid); logDiff(log, "md_name", md_name, rhs.md_name); logDiff(log, "destrSb", destrSb, rhs.destrSb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/Md.h new/libstorage-2.23.8/storage/Md.h --- old/libstorage-2.23.7/storage/Md.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/Md.h 2013-02-27 18:26:33.000000000 +0100 @@ -109,6 +109,7 @@ // In case of IMSM and DDF raids there is 'container'. bool has_container; + bool inactive; string parent_container; string parent_uuid; string parent_md_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/ProcMdstat.cc new/libstorage-2.23.8/storage/ProcMdstat.cc --- old/libstorage-2.23.7/storage/ProcMdstat.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/ProcMdstat.cc 2013-02-27 18:26:33.000000000 +0100 @@ -82,6 +82,7 @@ if( tmp=="(read-only)" || tmp=="(auto-read-only)" || tmp=="inactive" ) { entry.readonly = true; + entry.inactive = tmp=="inactive"; line.erase( 0, pos ); boost::trim_left(line, locale::classic()); } @@ -106,7 +107,7 @@ if( (pos=line.find_first_not_of( app_ws ))!=string::npos && pos!=0 ) line.erase( 0, pos ); } - else + else if( !entry.inactive ) { entry.is_container = true; } @@ -276,6 +277,9 @@ if (entry.readonly) s << " readonly"; + if (entry.inactive) + s << " inactive"; + s << " devices:" << entry.devices; if (!entry.spares.empty()) s << " spares:" << entry.spares; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/ProcMdstat.h new/libstorage-2.23.8/storage/ProcMdstat.h --- old/libstorage-2.23.7/storage/ProcMdstat.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/ProcMdstat.h 2013-02-27 18:26:33.000000000 +0100 @@ -36,7 +36,7 @@ struct Entry { Entry() : md_type(RAID_UNK), md_parity(PAR_DEFAULT), size_k(0), chunk_k(0), - readonly(false), is_container(false), has_container(false) {} + readonly(false), inactive(false), is_container(false), has_container(false) {} MdType md_type; MdParity md_parity; @@ -47,6 +47,7 @@ unsigned long chunk_k; bool readonly; + bool inactive; list<string> devices; list<string> spares; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/StorageInterface.h new/libstorage-2.23.8/storage/StorageInterface.h --- old/libstorage-2.23.7/storage/StorageInterface.h 2013-02-15 10:16:33.000000000 +0100 +++ new/libstorage-2.23.8/storage/StorageInterface.h 2013-02-27 18:26:33.000000000 +0100 @@ -479,6 +479,7 @@ unsigned long chunkSizeK; string devices; string spares; + bool inactive; }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/gen_md5sum.cc new/libstorage-2.23.8/storage/gen_md5sum.cc --- old/libstorage-2.23.7/storage/gen_md5sum.cc 2013-02-21 19:17:13.000000000 +0100 +++ new/libstorage-2.23.8/storage/gen_md5sum.cc 2013-02-27 18:32:07.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "66906e7171bb8538b582a4361d69826e" -#define SOURCES_MD5_DATE " Thu Feb 21 19:17:13 CET 2013 " +#define SOURCES_MD5SUM "34042be9aa2311c3032b075cfe2fb472" +#define SOURCES_MD5_DATE " Wed Feb 27 18:32:07 CET 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org