--trivial-only and --no-remove. --trivial-only and --no...

[apt.git] / apt-pkg / acquire-method.cc

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 678b10646699aefc2c305673742de701e6f4ffbf..5b7251a5fe0aefebfc2a3ce2978f474e9de81802 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,10 +1,17 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-method.cc,v 1.18 1999/03/15 08:10:39 jgg Exp $
+// $Id: acquire-method.cc,v 1.21 1999/10/18 00:37:35 jgg Exp $
 /* ######################################################################
 
    Acquire Method
 
+   This is a skeleton class that implements most of the functionality
+   of a method and some usefull functions to make method implementation
+   simpler. The methods all derive this and specialize it. The most
+   complex implementation is the http method which needs to provide
+   pipelining, it runs the message engine at the same time it is 
+   downloading files..
+   
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
@@ -42,6 +49,9 @@ pkgAcqMethod::pkgAcqMethod(const char *Ver,unsigned long Flags)
 
    if ((Flags & LocalOnly) == LocalOnly)
       strcat(End,"Local-Only: true\n");
+
+   if ((Flags & NeedsCleanup) == NeedsCleanup)
+      strcat(End,"Needs-Cleanup: true\n");
    strcat(End,"\n");
 
    if (write(STDOUT_FILENO,S,strlen(S)) != (signed)strlen(S))
@@ -119,14 +129,14 @@ void pkgAcqMethod::URIStart(FetchResult &Res)
    
    End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
    if (Res.Size != 0)
-      End += snprintf(End,sizeof(S) - (End - S),"Size: %u\n",Res.Size);
+      End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);
    
    if (Res.LastModified != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
                      TimeRFC1123(Res.LastModified).c_str());
    
    if (Res.ResumePoint != 0)
-      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
+      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",
                      Res.ResumePoint);
       
    strcat(End,"\n");
@@ -151,7 +161,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
       End += snprintf(End,sizeof(S) - (End - S),"Filename: %s\n",Res.Filename.c_str());
    
    if (Res.Size != 0)
-      End += snprintf(End,sizeof(S) - (End - S),"Size: %u\n",Res.Size);
+      End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);
    
    if (Res.LastModified != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
@@ -161,7 +171,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
       End += snprintf(End,sizeof(S) - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
 
    if (Res.ResumePoint != 0)
-      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
+      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",
                      Res.ResumePoint);
 
    if (Res.IMSHit == true)
@@ -174,7 +184,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
         End += snprintf(End,sizeof(S) - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());
       
       if (Alt->Size != 0)
-        End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %u\n",Alt->Size);
+        End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %lu\n",Alt->Size);
       
       if (Alt->LastModified != 0)
         End += snprintf(End,sizeof(S) - (End - S),"Alt-Last-Modified: %s\n",
@@ -290,7 +300,9 @@ bool pkgAcqMethod::Configuration(string Message)
                                                                        /*}}}*/
 // AcqMethod::Run - Run the message engine                             /*{{{*/
 // ---------------------------------------------------------------------
-/* */
+/* Fetch any messages and execute them. In single mode it returns 1 if
+   there are no more available messages - any other result is a 
+   fatal failure code! */
 int pkgAcqMethod::Run(bool Single)
 {
    while (1)
@@ -300,15 +312,14 @@ int pkgAcqMethod::Run(bool Single)
       {
         if (Single == false)
            if (WaitFd(STDIN_FILENO) == false)
-              return 0;
-      
+              break;
         if (ReadMessages(STDIN_FILENO,Messages) == false)
-           return 0;
+           break;
       }
             
       // Single mode exits if the message queue is empty
       if (Single == true && Messages.empty() == true)
-        return 0;
+        return -1;
       
       string Message = Messages.front();
       Messages.erase(Messages.begin());
@@ -323,7 +334,7 @@ int pkgAcqMethod::Run(bool Single)
       }
 
       switch (Number)
-      {
+      {         
         case 601:
         if (Configuration(Message) == false)
            return 100;
@@ -356,6 +367,7 @@ int pkgAcqMethod::Run(bool Single)
       }      
    }
 
+   Exit();
    return 0;
 }
                                                                        /*}}}*/