From 9995c4a0bc2d8567ff9f11d338ad610754682372 Mon Sep 17 00:00:00 2001 From: Ishan Jayawardena Date: Mon, 13 Jun 2011 15:16:14 +0530 Subject: added support for downloading debdelta files and queuing successfully downloaded debdeltas for processing with the debdelta apt method, in apt-pkg/acquire-item.{cc,h} in pkgAcqArchive class. Currently, no index for deltas are used. Proper progress reporting and methods to verify the debdeltas are yet to be added. --- apt-pkg/contrib/strutl.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'apt-pkg/contrib/strutl.cc') diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 072dda3ac..a452f65f3 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -442,6 +442,7 @@ std::string OutputInDepth(const unsigned long Depth, const char* Separator) string URItoFileName(const string &URI) { // Nuke 'sensitive' items + //std::cerr << "\n>>>>URItoFileName():\n URI: " << URI << std::endl; ::URI U(URI); U.User.clear(); U.Password.clear(); @@ -450,6 +451,7 @@ string URItoFileName(const string &URI) // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); replace(NewURI.begin(),NewURI.end(),'/','_'); + //std::cerr << " NewUri: " << NewURI << std::endl; return NewURI; } /*}}}*/ @@ -723,6 +725,7 @@ string TimeRFC1123(time_t Date) */ bool ReadMessages(int Fd, vector &List) { + //std::cerr << "ReadMessages() Reading from Fd " << Fd << std::endl; char Buffer[64000]; char *End = Buffer; // Represents any left-over from the previous iteration of the @@ -765,6 +768,7 @@ bool ReadMessages(int Fd, vector &List) I = Buffer; List.push_back(PartialMessage); + //std::cerr << " pushed back message:" << PartialMessage << std::endl; PartialMessage.clear(); } if (End != Buffer) @@ -790,7 +794,7 @@ bool ReadMessages(int Fd, vector &List) // -- dburrows 2008-04-02 return true; } - + //std::cerr << " calling WaidFd again." << std::endl; if (WaitFd(Fd) == false) return false; } -- cgit v1.2.3