Browse Source

convert FileExists to DirectoryExists to check if the path is really a

directory (and to have a better method name in the error message if not)
debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
448eaf8b59
  1. 4
      apt-pkg/init.cc
  2. 4
      apt-pkg/policy.cc
  3. 8
      apt-pkg/sourcelist.cc

4
apt-pkg/init.cc

@ -94,10 +94,10 @@ bool pkgInitConfig(Configuration &Cnf)
// Read the configuration parts dir
string Parts = Cnf.FindDir("Dir::Etc::parts");
if (FileExists(Parts) == true)
if (DirectoryExists(Parts) == true)
Res &= ReadConfigDir(Cnf,Parts);
else
_error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
_error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());
// Read the main config file
string FName = Cnf.FindFile("Dir::Etc::main");

4
apt-pkg/policy.cc

@ -291,9 +291,9 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
if (Dir.empty() == true)
Dir = _config->FindDir("Dir::Etc::PreferencesParts");
if (FileExists(Dir) == false)
if (DirectoryExists(Dir) == false)
{
_error->WarningE("FileExists",_("Unable to read %s"),Dir.c_str());
_error->WarningE("DirectoryExists",_("Unable to read %s"),Dir.c_str());
return true;
}

8
apt-pkg/sourcelist.cc

@ -199,15 +199,15 @@ bool pkgSourceList::ReadMainList()
if (FileExists(Main) == true)
Res &= ReadAppend(Main);
else if (FileExists(Parts) == false)
else if (DirectoryExists(Parts) == false)
// Only warn if there are no sources.list.d.
_error->WarningE("FileExists",_("Unable to read %s"),Main.c_str());
_error->WarningE("DirectoryExists", _("Unable to read %s"), Parts.c_str());
if (FileExists(Parts) == true)
if (DirectoryExists(Parts) == true)
Res &= ReadSourceDir(Parts);
else if (FileExists(Main) == false)
// Only warn if there is no sources.list file.
_error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
_error->WarningE("FileExists", _("Unable to read %s"), Main.c_str());
return Res;
}

Loading…
Cancel
Save