summaryrefslogtreecommitdiff
path: root/apt-pkg/depcache.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-06-29 18:40:42 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-06-29 18:40:42 +0200
commitd6ebeb21ddb3d8f3d485562cdac0e0878d50c936 (patch)
tree80ad403b4a4c8d22f2f7e8626fd765cadd83ef2e /apt-pkg/depcache.cc
parentfa3b09450ed3da175f619ca77d9dceb9a6f81972 (diff)
* support IsAutoInstallOk in the resolver too
* honor the dpkg hold state in IsAutoInstallOk (closes: #64141)
Diffstat (limited to 'apt-pkg/depcache.cc')
-rw-r--r--apt-pkg/depcache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 9f734cca2..8af6941cf 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1069,7 +1069,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
library can override this method to control the MarkInstall behaviour */
bool pkgDepCache::IsAutoInstallOk(const PkgIterator &Pkg, unsigned long Depth)
{
- return true;
+ return (Pkg->SelectedState != pkgCache::State::Hold);
}
/*}}}*/
// DepCache::SetReInstall - Set the reinstallation flag /*{{{*/