From 3c124dde9567dd8c45d271bf2eaadffa5754f7d9 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:52:15 +0000
Subject: Supports no automatic Author: jgg Date: 1998-12-14 08:07:28 GMT
 Supports no automatic

---
 apt-pkg/depcache.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'apt-pkg/depcache.cc')

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index eb9d5a35b..cd3597ef7 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: depcache.cc,v 1.11 1998/12/10 04:22:45 jgg Exp $
+// $Id: depcache.cc,v 1.12 1998/12/14 08:07:29 jgg Exp $
 /* ######################################################################
 
    Dependency Cache - Caches Dependency information.
@@ -104,14 +104,15 @@ pkgDepCache::VerIterator pkgDepCache::GetCandidateVer(PkgIterator Pkg)
    // Try to use an explicit target
    if (Pkg->TargetVer == 0)
    {
-      /* Not source versions cannot be a candidate version unless they
-         are already installed */
+      /* Not source/not automatic versions cannot be a candidate version 
+         unless they are already installed */
       for (VerIterator I = Pkg.VersionList(); I.end() == false; I++)
       {
 	 if (Pkg.CurrentVer() == I)
 	    return I;
 	 for (VerFileIterator J = I.FileList(); J.end() == false; J++)
-	    if ((J.File()->Flags & Flag::NotSource) == 0)
+	    if ((J.File()->Flags & Flag::NotSource) == 0 &&
+		(J.File()->Flags & Flag::NotAutomatic) == 0)
 		return I;
       }
 	 
-- 
cgit v1.2.3-70-g09d2