From 196fd13629fc0f673b18735d633bdf69a3272590 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Mar 2011 11:34:32 +0100 Subject: * mirror method: - when downloading data, show the mirror being used --- apt-pkg/acquire-method.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'apt-pkg/acquire-method.cc') diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 17d52cf51..29d53f2ac 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -149,6 +149,8 @@ void pkgAcqMethod::URIStart(FetchResult &Res) if (Res.ResumePoint != 0) End += snprintf(End,sizeof(S)-4 - (End - S),"Resume-Point: %lu\n", Res.ResumePoint); + if (UsedMirror.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"UsedMirror: %s\n",UsedMirror.c_str()); strcat(End,"\n"); if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S)) @@ -418,9 +420,11 @@ void pkgAcqMethod::Log(const char *Format,...) // sprintf the description char S[1024]; - unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\nURI: %s\n" - "Message: ",CurrentURI.c_str()); - + unsigned int Len = snprintf(S,sizeof(S)-4,"101 Log\n" + "URI: %s\n" + "UsedMirror: %s\n" + "Message: ", UsedMirror.c_str(), + CurrentURI.c_str()); vsnprintf(S+Len,sizeof(S)-4-Len,Format,args); strcat(S,"\n\n"); @@ -442,8 +446,11 @@ void pkgAcqMethod::Status(const char *Format,...) // sprintf the description char S[1024]; - unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\nURI: %s\n" - "Message: ",CurrentURI.c_str()); + unsigned int Len = snprintf(S,sizeof(S)-4,"102 Status\n" + "URI: %s\n" + "UsedMirror: %s\n" + "Message: ",UsedMirror.c_str(), + CurrentURI.c_str()); vsnprintf(S+Len,sizeof(S)-4-Len,Format,args); strcat(S,"\n\n"); -- cgit v1.2.3