Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-08-15 09:58:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-29 16:48:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-08-15 09:58:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 29 12:44:33 CEST 2014 - [email protected] + +- also remove crypt devices during deactivation (bnc#888128) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.14.tar.bz2 ++++++ 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-03-26 18:08:49.000000000 +0100 +++ new/libstorage-2.25.14/storage/Dm.cc 2014-07-29 13:55:45.000000000 +0200 @@ -264,9 +264,8 @@ void Dm::computePe( const SystemCmd& c, PeMap& pe ) { pe.clear(); - for( unsigned i=0; i<c.numLines(); i++ ) + for (const string& line : c.stdout()) { - string line = c.getLine(i); unsigned long le = computeLe(extractNthWord( 1, line )); string tgt = extractNthWord( 2, line ); if( tgt=="linear" ) @@ -522,16 +521,11 @@ } else { - c.execute(DMSETUPBIN " info -c -o name,subsystem"); SystemCmd rm; - for( unsigned i=0; i<c.numLines(); i++ ) + const CmdDmsetupInfo cmddmsetupinfo; + for (const CmdDmsetupInfo::value_type& info : cmddmsetupinfo) { - if( extractNthWord(1, c.getLine(i)) != "CRYPT" ) - { - string cmd = DMSETUPBIN " remove "; - cmd += extractNthWord(0, c.getLine(i)); - rm.execute( cmd ); - } + rm.execute(DMSETUPBIN " remove " + info.first); } } active = val; 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-03-26 18:08:49.000000000 +0100 +++ new/libstorage-2.25.14/storage/LvmLv.cc 2014-07-30 09:52:01.000000000 +0200 @@ -164,14 +164,12 @@ void LvmLv::getState(LvmLvSnapshotStateInfo& info) { - SystemCmd cmd(LVSBIN " --options lv_name,lv_attr,snap_percent " + quote(cont->name())); + SystemCmd cmd(LVSBIN " --noheadings --options lv_name,lv_attr,snap_percent " + quote(cont->name())); - if (cmd.retcode() == 0 && cmd.numLines() > 0) + if (cmd.retcode() == 0) { - for (unsigned int l = 1; l < cmd.numLines(); l++) + for (const string& line : cmd.stdout()) { - string line = cmd.getLine(l); - if (extractNthWord(0, line) == name()) { string attr = extractNthWord(1, line); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Storage.cc new/libstorage-2.25.14/storage/Storage.cc --- old/libstorage-2.25.14/storage/Storage.cc 2014-04-15 12:13:27.000000000 +0200 +++ new/libstorage-2.25.14/storage/Storage.cc 2014-07-29 13:55:45.000000000 +0200 @@ -5728,6 +5728,7 @@ return Disk::getDlabelCapabilities(dlabel, dlabelcapabilities); } + void Storage::removeDmTableTo( unsigned long mjr, unsigned long mnr ) { y2mil( "mjr:" << mjr << " mnr:" << mnr ); @@ -5735,12 +5736,8 @@ cmd += decString(mjr) + ":" + decString(mnr); cmd += " | sed s/:.*// | uniq"; SystemCmd c( cmd ); - unsigned line=0; - while( line<c.numLines() ) - { - removeDmTable( c.getLine(line) ); - line++; - } + for (const string& line : c.stdout()) + removeDmTable(line); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.14/storage/Volume.cc new/libstorage-2.25.14/storage/Volume.cc --- old/libstorage-2.25.14/storage/Volume.cc 2014-07-14 21:06:43.000000000 +0200 +++ new/libstorage-2.25.14/storage/Volume.cc 2014-07-29 13:55:45.000000000 +0200 @@ -3524,12 +3524,12 @@ if( !v.dmcrypt_dev.empty() ) s << " dmcrypt:" << v.dmcrypt_dev; if( v.dmcrypt_active ) - s << " active"; + s << " dmcrypt_active"; if( v.is_loop ) { s << " loop:" << v.loop_dev; if( v.loop_active ) - s << " active"; + s << " loop_active"; if( v.fstab_loop_dev != v.loop_dev ) { s << " fstab_loop:" << v.fstab_loop_dev; @@ -3577,6 +3577,8 @@ logDiff(log, "dtxt", dtxt, rhs.dtxt); + logDiff(log, "dmcrypt_active", dmcrypt_active, rhs.dmcrypt_active); + logDiff(log, "is_loop", is_loop, rhs.is_loop); logDiff(log, "loop_active", loop_active, rhs.loop_active); logDiff(log, "loop_dev", loop_dev, rhs.loop_dev); 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-07-28 13:54:35.000000000 +0200 +++ new/libstorage-2.25.14/storage/gen_md5sum.cc 2014-07-30 09:52:03.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "03b8224ca55ef21d19a70a69ad8a1f02" -#define SOURCES_MD5_DATE " Mon 28 Jul 13:54:35 CEST 2014 " +#define SOURCES_MD5SUM "eb68d88058ce5985da4464a9b91d3e03" +#define SOURCES_MD5_DATE " Wed 30 Jul 09:52:03 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
