From 42610b9d5a95ec108b74ffbc6446542cf6b0176a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 29 Jun 2016 10:16:14 +0200 Subject: if conf unset, don't read / as conf/pref/sources dir Usually these config options are set to sensible values, but if init isn't run or the user interferes with configuration clearing or similar the options could indeed carry an empty value, which will result in FindDir returning a '/'. That feels kinda wrong, but as a public interface there isn't much we can do about it and instead make it so that we get the special file /dev/null back we know how to deal with in such cases. --- apt-pkg/policy.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/policy.cc') diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 2bdd96d8c..ff59fb0ac 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -307,11 +307,11 @@ APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &Fi bool ReadPinDir(pkgPolicy &Plcy,string Dir) { if (Dir.empty() == true) - Dir = _config->FindDir("Dir::Etc::PreferencesParts"); + Dir = _config->FindDir("Dir::Etc::PreferencesParts", "/dev/null"); if (DirectoryExists(Dir) == false) { - if (Dir != "/dev/null") + if (APT::String::Endswith(Dir, "/dev/null") == false) _error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str()); return true; } -- cgit v1.2.3