summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:23 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:23 +0000
commitb98f285980c3c2701539e196993ead268141aaeb (patch)
tree3e3859db916e6f9b3d56b341b91a2836ff5b4d51 /methods
parent769f7e1ae907a499199c1f7a34124c1770f37176 (diff)
Almost done now
Author: jgg Date: 1998-11-11 06:54:13 GMT Almost done now
Diffstat (limited to 'methods')
-rw-r--r--methods/gzip.cc8
-rw-r--r--methods/http.cc4
-rw-r--r--methods/http.h4
3 files changed, 9 insertions, 7 deletions
diff --git a/methods/gzip.cc b/methods/gzip.cc
index a78fcb3ee..908407b81 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: gzip.cc,v 1.5 1998/11/05 07:21:47 jgg Exp $
+// $Id: gzip.cc,v 1.6 1998/11/11 06:54:19 jgg Exp $
/* ######################################################################
GZip method - Take a file URI in and decompress it into the target
@@ -37,6 +37,10 @@ bool GzipMethod::Fetch(FetchItem *Itm)
{
URI Get = Itm->Uri;
+ FetchResult Res;
+ Res.Filename = Itm->DestFile;
+ URIStart(Res);
+
// Open the source and destintation files
FileFd From(Get.Path,FileFd::ReadOnly);
FileFd To(Itm->DestFile,FileFd::WriteEmpty);
@@ -96,9 +100,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
return _error->Errno("utime","Failed to set modification time");
// Return a Done response
- FetchResult Res;
Res.LastModified = Buf.st_mtime;
- Res.Filename = Itm->DestFile;
URIDone(Res);
return true;
diff --git a/methods/http.cc b/methods/http.cc
index b97d1dbc9..fec484249 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: http.cc,v 1.4 1998/11/05 07:21:48 jgg Exp $
+// $Id: http.cc,v 1.5 1998/11/11 06:54:21 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -613,7 +613,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Proxy-Authorization: Basic ") + Base64Encode(ProxyAuth) + "\r\n";*/
Req += "User-Agent: Debian APT-HTTP/1.2\r\n\r\n";
-// cout << Req << endl;
+// cerr << Req << endl;
Out.Read(Req);
}
diff --git a/methods/http.h b/methods/http.h
index 62f329ef5..983904ffb 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: http.h,v 1.3 1998/11/04 07:10:50 jgg Exp $
+// $Id: http.h,v 1.4 1998/11/11 06:54:22 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -133,7 +133,7 @@ class HttpMethod : public pkgAcqMethod
int Loop();
- HttpMethod() : pkgAcqMethod("1.2",SingleInstance | Pipeline | SendConfig)
+ HttpMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig)
{
Depth = 0;
File = 0;