ref: refs/heads/master
commit 7b611040dd784e297326f93f12a5b0e63a990a1d
Author: Duncan Mac-Vicar P
Date: Fri Mar 6 18:22:38 2009 +0100
aria2: show the filename in progress, not the repository
---
zypp/media/MediaAria2c.cc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zypp/media/MediaAria2c.cc b/zypp/media/MediaAria2c.cc
index 2dfa285..c525a3d 100644
--- a/zypp/media/MediaAria2c.cc
+++ b/zypp/media/MediaAria2c.cc
@@ -297,7 +297,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
{
try
{
- report->start(_url, target.asString() );
+ report->start(fileurl, target.asString() );
ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout);
@@ -387,7 +387,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
average_speed = (((average_speed_count - 1 )*average_speed) + current_speed)/average_speed_count;
// note that aria report speed in kbpss, while the report takes bps
- report->progress ( progress, _url, average_speed * 1024, current_speed * 1024 );
+ report->progress ( progress, fileurl, average_speed * 1024, current_speed * 1024 );
// clear the progress line to detect mismatches between
// [# and FILE: lines
progressLine.clear();
@@ -445,7 +445,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
}
}
- report->finish( _url , zypp::media::DownloadProgressReport::NO_ERROR, "");
+ report->finish( fileurl , zypp::media::DownloadProgressReport::NO_ERROR, "");
retry = false;
}
// retry with proper authentication data
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org