summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:22 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:22 +0000
commitfbfb2a7cad49c38a8a830ceadbc20ab89f683718 (patch)
tree31ef8c12d6b58e2c2679dccb49b36fb7cd0ac179
parent53da8d703e228f7107688aa38fe305a0ba8d91e4 (diff)
Enum fix
Author: jgg Date: 1998-11-08 23:29:18 GMT Enum fix
-rw-r--r--apt-pkg/pkgcache.cc7
-rw-r--r--apt-pkg/pkgcache.h4
2 files changed, 6 insertions, 5 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 99cd11413..aef6541e5 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgcache.cc,v 1.13 1998/11/06 02:52:22 jgg Exp $
+// $Id: pkgcache.cc,v 1.14 1998/11/08 23:29:19 jgg Exp $
/* ######################################################################
Package Cache - Accessor code for the cache
@@ -44,7 +44,7 @@ pkgCache::Header::Header()
/* Whenever the structures change the major version should be bumped,
whenever the generator changes the minor version should be bumped. */
MajorVersion = 2;
- MinorVersion = 0;
+ MinorVersion = 1;
Dirty = true;
HeaderSz = sizeof(pkgCache::Header);
@@ -287,7 +287,8 @@ bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result)
// ---------------------------------------------------------------------
/* This is a more usefull version of TargetPkg() that follows versioned
provides. It includes every possible package-version that could satisfy
- the dependency. The last item in the list has a 0. */
+ the dependency. The last item in the list has a 0. The resulting pointer
+ must be delete [] 'd */
pkgCache::Version **pkgCache::DepIterator::AllTargets()
{
Version **Res = 0;
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 9dd9869db..23c60af95 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgcache.h,v 1.8 1998/10/20 02:39:20 jgg Exp $
+// $Id: pkgcache.h,v 1.9 1998/11/08 23:29:18 jgg Exp $
/* ######################################################################
Cache - Structure definitions for the cache file
@@ -66,7 +66,7 @@ class pkgCache
struct State
{
- enum VerPriority {Important=1,Required=2,Standard=3,Optional=5,Extra=5};
+ enum VerPriority {Important=1,Required=2,Standard=3,Optional=4,Extra=5};
enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,