diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:08 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:08 +0000 |
| commit | 3d615484858169e6732ef4f236fd3f38d0083a89 (patch) | |
| tree | af17b8d0fd6f7b95e5298598d3ceb8dba3ac3f42 /apt-pkg | |
| parent | f1663bdf8391e09939e88f070171ed3fe3ab2cbd (diff) | |
More bugs fixes
Author: jgg
Date: 1998-12-10 04:22:45 GMT
More bugs fixes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/depcache.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/sourcelist.cc | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 7f9ded720..eb9d5a35b 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.10 1998/12/08 01:34:07 jgg Exp $ +// $Id: depcache.cc,v 1.11 1998/12/10 04:22:45 jgg Exp $ /* ###################################################################### Dependency Cache - Caches Dependency information. @@ -588,7 +588,10 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg) RemoveSizes(Pkg); RemoveStates(Pkg); - P.Mode = ModeDelete; + if (Pkg->CurrentVer == 0) + P.Mode = ModeKeep; + else + P.Mode = ModeDelete; P.InstallVer = 0; P.Flags &= Flag::Auto; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index dd9d8586d..3fc88586b 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: packagemanager.cc,v 1.9 1998/12/08 01:34:12 jgg Exp $ +// $Id: packagemanager.cc,v 1.10 1998/12/10 04:22:46 jgg Exp $ /* ###################################################################### Package Manager - Abstacts the package manager @@ -371,7 +371,6 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && Cache[Pkg].Keep() == true) { - cout << "Bailing" << endl; List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) if (SmartConfigure(Pkg) == false) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index c3fb5642f..371898810 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.8 1998/10/20 04:33:15 jgg Exp $ +// $Id: sourcelist.cc,v 1.9 1998/12/10 04:22:47 jgg Exp $ /* ###################################################################### List of Sources @@ -254,6 +254,9 @@ string pkgSourceList::Item::ArchiveInfo(pkgCache::VerIterator Ver) const Res += " "; Res += Ver.ParentPkg().Name(); + Res += " "; + Res += Ver.VerStr(); + break; }; return Res; |