summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-07-15 16:45:49 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-07-15 16:45:49 +0200
commitef1dff93202fa61e0b8cda761906bbca31e217bc (patch)
tree860a9c6462a2ea9ef09c01de9a10ee19a4944c78 /cmdline
parent13eb93fcb6a03afd8fc05fa2b4c60046473e8507 (diff)
parent6e7c6c3f58193fd5db3d9d598ac65a1571522a58 (diff)
merge with lp:~mvo/apt/debian-sid
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-cache.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 93558fa88..57da9426f 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -401,7 +401,7 @@ bool DumpAvail(CommandLine &Cmd)
pkgCache &Cache = *GCache;
pkgPolicy Plcy(&Cache);
- if (ReadPinFile(Plcy) == false)
+ if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false)
return false;
unsigned long Count = Cache.HeaderP->PackageCount+1;
@@ -1511,7 +1511,7 @@ bool Policy(CommandLine &CmdL)
pkgCache &Cache = *GCache;
pkgPolicy Plcy(&Cache);
- if (ReadPinFile(Plcy) == false)
+ if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false)
return false;
// Print out all of the package files