X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5a43a2417802417e711bc5bbdc3675a0ec79ab1e..f17ac0977167d1e58316d3b3f7159f65d40a090a:/apt-pkg/init.cc diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index e504e4a14..29926b97a 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.cc,v 1.11 1998/11/05 07:42:03 jgg Exp $ +// $Id: init.cc,v 1.14 1998/11/25 23:54:06 jgg Exp $ /* ###################################################################### Init - Initialize the package library @@ -33,6 +33,7 @@ bool pkgInitialize(Configuration &Cnf) Cnf.Set("Dir::State::xstatus","xstatus"); Cnf.Set("Dir::State::userstatus","status.user"); Cnf.Set("Dir::State::status","/var/lib/dpkg/status"); + Cnf.Set("Dir::State::cdroms","cdroms.list"); // Cache Cnf.Set("Dir::Cache","/var/cache/apt/"); @@ -45,6 +46,7 @@ bool pkgInitialize(Configuration &Cnf) Cnf.Set("Dir::Etc::sourcelist","sources.list"); Cnf.Set("Dir::Etc::main","apt.conf"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); + Cnf.Set("Dir::Bin::dpkg","/usr/bin/dpkg"); // Read the main config file string FName = Cnf.FindFile("Dir::Etc::main"); @@ -54,7 +56,7 @@ bool pkgInitialize(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (Cfg != 0 && FileExists(FName) == true) + if (Cfg != 0 && FileExists(Cfg) == true) Res &= ReadConfigFile(Cnf,Cfg); if (Res == false)