diff options
| -rw-r--r-- | apt-pkg/algorithms.cc | 19 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 15 insertions, 7 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index aa3e86568..fec16e095 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: algorithms.cc,v 1.41 2002/04/26 05:36:20 jgg Exp $ +// $Id: algorithms.cc,v 1.42 2002/11/09 23:10:32 doogie Exp $ /* ###################################################################### Algorithms - A set of misc algorithms @@ -49,17 +49,22 @@ pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache), /*}}}*/ // Simulate::Describe - Describe a package /*{{{*/ // --------------------------------------------------------------------- -/* */ +/* Parameter Now == true gives both current and available varsion, + Parameter Now == false gives only the available package version */ void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Now) { VerIterator Ver(Sim); + + out << Pkg.Name(); + if (Now == true) + { Ver = Pkg.CurrentVer(); - else - Ver = Sim[Pkg].CandidateVerIter(Sim); + if (Ver.end() == false) + out << " [" << Ver.VerStr() << ']'; + } - out << Pkg.Name(); - + Ver = Sim[Pkg].CandidateVerIter(Sim); if (Ver.end() == true) return; @@ -76,7 +81,7 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) Flags[Pkg->ID] = 1; cout << "Inst "; - Describe(Pkg,cout,false); + Describe(Pkg,cout,true); Sim.MarkInstall(Pkg,false); // Look for broken conflicts+predepends. diff --git a/debian/changelog b/debian/changelog index f818a3961..b86a0b1ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,4 @@ + apt (0.5.5) unstable; urgency=low * Fix handling of [!arch] for build-dependencies. Closes: #88798, #149595 @@ -61,6 +62,8 @@ apt (0.5.5) unstable; urgency=low * apt-extracttemplates now prepends the package name when extracting files. Closes: #132776 * Add -n synonym for --names-only for apt-cache. Closes: #130689 + * Display both current version and new version in apt-get -s. Closes: + #92358 -- Jason Gunthorpe <jgg@debian.org> Sun, 15 Sep 2002 17:16:59 -0600 |