Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-08-12 11:05:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-27 15:47:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-08-12 11:05:04.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 7 15:59:47 CEST 2013 - [email protected] + +- fix progress bar for EXT filesystems + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.24.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.1/storage/OutputProcessor.cc new/libstorage-2.24.1/storage/OutputProcessor.cc --- old/libstorage-2.24.1/storage/OutputProcessor.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.24.1/storage/OutputProcessor.cc 2013-08-07 16:02:18.000000000 +0200 @@ -51,46 +51,46 @@ { seen += val; string::size_type pos; - string::size_type bpos = seen.find( "\b" ); - y2deb("bpos:" << bpos); - if( bpos==0 ) - { - seen.erase( 0, seen.find_first_not_of( "\b", bpos )); - } - while( first && (pos=seen.find( "\n" )) != string::npos && pos<bpos ) - { + string::size_type bpos; + if( !inode_tab ) + inode_tab = seen.find("Writing inode tables")!=string::npos; + bpos = (inode_tab?seen.find( "\b" ):string::npos); + if( inode_tab ) + bpos = seen.find( "\b" ); + while( !inode_tab && (pos=seen.find( "\n" )) != string::npos ) seen.erase( 0, pos+1 ); - } - while( bpos != string::npos ) + y2deb("first:" << first << " inode:" << inode_tab << " bpos:" << bpos); + while( inode_tab && bpos != string::npos ) { pos = seen.find_first_of( "0123456789" ); - if( pos != string::npos ) - seen.erase( 0, pos ); y2deb("seen:" << seen); - string number = seen.substr( 0, bpos ); - y2deb("number:" << number); - list<string> l = splitString(number, "/" ); - list<string>::const_iterator i = l.begin(); - if( i != l.end() ) + if( pos != string::npos ) { - unsigned cval, mx; - *i++ >> cval; - if( first && i != l.end() ) - { - *i >> mx; - setMaxValue( mx+4 ); - setCurValue( 0 ); - first = false; - } - else if( !first ) + string number = seen.substr( pos, bpos ); + y2deb("number:" << number); + list<string> l = splitString(number, "/" ); + list<string>::const_iterator i = l.begin(); + if( i != l.end() ) { - setCurValue( cval ); + unsigned cval, mx; + *i++ >> cval; + if( first && i != l.end() ) + { + *i >> mx; + setMaxValue( mx+4 ); + setCurValue( 0 ); + first = false; + } + else if( !first ) + { + setCurValue( cval ); + } } } seen.erase( 0, seen.find_first_not_of( "\b", bpos )); bpos = seen.find( "\b" ); } - if( seen.find( "done" )!=string::npos ) + if( inode_tab && seen.find( "done" )!=string::npos ) { setCurValue(getMaxValue() - 4); done = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.1/storage/OutputProcessor.h new/libstorage-2.24.1/storage/OutputProcessor.h --- old/libstorage-2.24.1/storage/OutputProcessor.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.24.1/storage/OutputProcessor.h 2013-08-07 16:02:18.000000000 +0200 @@ -79,6 +79,7 @@ { setMaxValue(100); done = false; + inode_tab = false; } virtual void process(const string& txt, bool stderr); @@ -86,6 +87,7 @@ protected: string seen; bool done; + bool inode_tab; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.1/storage/Storage.cc new/libstorage-2.24.1/storage/Storage.cc --- old/libstorage-2.24.1/storage/Storage.cc 2013-07-23 17:20:13.000000000 +0200 +++ new/libstorage-2.24.1/storage/Storage.cc 2013-08-08 16:36:47.000000000 +0200 @@ -3955,8 +3955,6 @@ if( ret==0 && md!=NULL ) { ret = md->createMd(num, rtype, normalizeDevices(devs), normalizeDevices(spares)); - if( ret==0 ) - checkPwdBuf( Md::mdDevice(num) ); } if( !have_md ) { @@ -3966,6 +3964,8 @@ delete md; } if( ret==0 ) + checkPwdBuf( Md::mdDevice(num) ); + if( ret==0 ) { ret = checkCache(); } @@ -4001,8 +4001,6 @@ if( ret==0 ) { ret = md->createMd(num, rtype, normalizeDevices(devs), normalizeDevices(spares)); - if( ret==0 ) - checkPwdBuf( Md::mdDevice(num) ); } if( !have_md ) { @@ -4014,6 +4012,8 @@ delete md; } if( ret==0 ) + checkPwdBuf( Md::mdDevice(num) ); + if( ret==0 ) { ret = checkCache(); } @@ -7396,14 +7396,15 @@ void Storage::checkPwdBuf( const string& device ) { - map<string,string>::iterator i=pwdBuf.find(device); - if( i!=pwdBuf.end() ) - { - VolIterator vol; - if( findVolume( device, vol ) ) - vol->setCryptPwd( i->second ); - pwdBuf.erase(i); - } + y2mil("device:"<<device); + map<string,string>::iterator i=pwdBuf.find(device); + if( i!=pwdBuf.end() ) + { + VolIterator vol; + if( findVolume( device, vol ) ) + vol->setCryptPwd( i->second ); + pwdBuf.erase(i); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.1/storage/Volume.cc new/libstorage-2.24.1/storage/Volume.cc --- old/libstorage-2.24.1/storage/Volume.cc 2013-06-19 12:25:52.000000000 +0200 +++ new/libstorage-2.24.1/storage/Volume.cc 2013-08-08 16:36:47.000000000 +0200 @@ -1771,8 +1771,7 @@ { is_loop = false; encryption = ENC_NONE; - crypt_pwd.erase(); - orig_crypt_pwd.erase(); + clearCryptPwd(); } else { @@ -2267,8 +2266,7 @@ is_loop = false; dmcrypt_dev.erase(); loop_dev.erase(); - crypt_pwd.erase(); - orig_crypt_pwd.erase(); + clearCryptPwd(); ret = ENC_UNKNOWN; encryption = save_enc; orig_encryption = save_orig; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.1/storage/gen_md5sum.cc new/libstorage-2.24.1/storage/gen_md5sum.cc --- old/libstorage-2.24.1/storage/gen_md5sum.cc 2013-07-23 17:28:02.000000000 +0200 +++ new/libstorage-2.24.1/storage/gen_md5sum.cc 2013-08-08 16:43:04.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "e2d082378bc85881c543e00f8cbc1b1c" -#define SOURCES_MD5_DATE " Tue Jul 23 17:28:02 CEST 2013 " +#define SOURCES_MD5SUM "ea17118211b9a08f33764b22c4dfc564" +#define SOURCES_MD5_DATE " Thu Aug 8 16:43:04 CEST 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
