From 7e798dd739883c1f47216578ba8df34dced24777 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:51:03 +0000
Subject: Sync Author: jgg Date: 1998-10-08 04:54:58 GMT Sync

---
 cmdline/apt-get.cc | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'cmdline/apt-get.cc')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index f3dd4205a..14a65449c 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-get.cc,v 1.1 1998/10/02 04:39:56 jgg Exp $
+// $Id: apt-get.cc,v 1.2 1998/10/08 04:55:05 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -110,9 +110,22 @@ void ShowBroken(ostream &out,pkgDepCache &Cache)
 	    // Show a quick summary of the version requirements
 	    if (D.TargetVer() != 0)
 	       out << " (" << D.CompType() << " " << D.TargetVer() << 
-	           ")" << endl;
-	    else
-	       out << endl;
+	           ")";
+	    
+	    /* Show a summary of the target package if possible. In the case
+	       of virtual packages we show nothing */
+	    pkgCache::PkgIterator Targ = D.TargetPkg();
+	    if (Targ->ProvidesList == 0)
+	    {
+	       out << " but ";
+	       pkgCache::VerIterator Ver = Cache[Targ].InstVerIter(Cache);
+	       if (Ver.end() == false)
+		  out << Ver.VerStr() << "is installed";
+	       else
+		  out << "it is not installed";
+	    }
+	    
+	    out << endl;
 	 }	    
       }   
    }   
@@ -364,6 +377,8 @@ bool CacheFile::Open()
 
 	 return _error->Error("Unable to correct dependencies");
       }
+      if (pkgMinimizeUpgrade(*Cache) == false)
+	 return _error->Error("Unable to minimize the upgrade set");
       
       c1out << " Done" << endl;
    }
-- 
cgit v1.2.3