projects
/
platform
/
upstream
/
libzypp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importing my current diff
[platform/upstream/libzypp.git]
/
zypp
/
repo
/
Applydeltarpm.cc
diff --git
a/zypp/repo/Applydeltarpm.cc
b/zypp/repo/Applydeltarpm.cc
index
ccd3e1a
..
4f79a13
100644
(file)
--- a/
zypp/repo/Applydeltarpm.cc
+++ b/
zypp/repo/Applydeltarpm.cc
@@
-32,7
+32,6
@@
namespace zypp
{ /////////////////////////////////////////////////////////////////
const Pathname applydeltarpm_prog( "/usr/bin/applydeltarpm" );
{ /////////////////////////////////////////////////////////////////
const Pathname applydeltarpm_prog( "/usr/bin/applydeltarpm" );
- const str::regex applydeltarpm_tick ( "([0-9]+) percent finished" );
/******************************************************************
**
/******************************************************************
**
@@
-43,16
+42,13
@@
namespace zypp
const Progress & report_r = Progress() )
{
ExternalProgram prog( argv_r, ExternalProgram::Stderr_To_Stdout );
const Progress & report_r = Progress() )
{
ExternalProgram prog( argv_r, ExternalProgram::Stderr_To_Stdout );
- str::smatch what;
for ( std::string line = prog.receiveLine(); ! line.empty(); line = prog.receiveLine() )
{
for ( std::string line = prog.receiveLine(); ! line.empty(); line = prog.receiveLine() )
{
- if ( report_r && str::regex_search( line, what, applydeltarpm_tick ) )
- {
- report_r( str::strtonum<unsigned>( what[1] ) );
- }
+ if ( report_r )
+ report_r( str::strtonum<unsigned>( line ));
else
DBG << "Applydeltarpm : " << line;
else
DBG << "Applydeltarpm : " << line;
- }
+
}
return( prog.close() == 0 );
}
return( prog.close() == 0 );
}