From 8e5fc8f5bea54e3c016a14fe4025dcb94864e874 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:54:53 +0000
Subject: CDROMs are unmounted Author: jgg Date: 1999-10-18 00:37:35 GMT CDROMs
 are unmounted

---
 apt-pkg/acquire-method.cc | 13 ++++++++-----
 1 file changed, 8 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 13b11c8db..5b7251a5f 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: acquire-method.cc,v 1.20 1999/08/04 02:39:13 jgg Exp $
+// $Id: acquire-method.cc,v 1.21 1999/10/18 00:37:35 jgg Exp $
 /* ######################################################################
 
    Acquire Method
@@ -49,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))
@@ -309,10 +312,9 @@ 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
@@ -332,7 +334,7 @@ int pkgAcqMethod::Run(bool Single)
       }
 
       switch (Number)
-      {
+      {	 
 	 case 601:
 	 if (Configuration(Message) == false)
 	    return 100;
@@ -365,6 +367,7 @@ int pkgAcqMethod::Run(bool Single)
       }      
    }
 
+   Exit();
    return 0;
 }
 									/*}}}*/
-- 
cgit v1.2.3