summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:03 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:03 +0000
commit7e798dd739883c1f47216578ba8df34dced24777 (patch)
treed756274fb10d7bb3a6b14306d46390139ce60da2 /cmdline/apt-get.cc
parent7e54a6d6f1d500a4e26dbe34952ff3af65d0b0b7 (diff)
Sync
Author: jgg Date: 1998-10-08 04:54:58 GMT Sync
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc23
1 files changed, 19 insertions, 4 deletions
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;
}