diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-29 16:18:10 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-29 16:18:10 +0200 |
| commit | 15240f4b681ca35c669d2b2e6e34f8ee3f6c06d9 (patch) | |
| tree | 4139050e3c2f00650a0d316c971c4e7b8aba3e58 /apt-inst | |
| parent | 34904390bd6901f3de90249938baa0b875873534 (diff) | |
| parent | 1b8ba3ba050f01db27f1ddc0e5b280b2fccd9fb9 (diff) | |
merged with the debian-experimental-ma branch
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/contrib/arfile.h | 1 | ||||
| -rw-r--r-- | apt-inst/deb/dpkgdb.cc | 2 | ||||
| -rw-r--r-- | apt-inst/makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 96e18bc60..7f6c68302 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -39,6 +39,7 @@ class ARArchive // Locate a member by name const Member *FindMember(const char *Name) const; + inline Member *Members() { return List; } ARArchive(FileFd &File); ~ARArchive(); diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index e51e4f8b3..a75cf59ca 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -142,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress) CacheMap = 0; } - if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false) + if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false) return false; Cache->DropProgress(); diff --git a/apt-inst/makefile b/apt-inst/makefile index abc8c3fd9..785dc62ba 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -14,7 +14,7 @@ include ../buildlib/libversion.mak # The library name LIBRARY=apt-inst -MAJOR=1.1 +MAJOR=1.2 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) |