diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:20 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:20 +0000 |
| commit | bfd22fc0ac2632c6196f5149dc3b3671d9ff15e0 (patch) | |
| tree | 2affe097f22065e344d2fc8921049ea7e3185d9b /apt-pkg/init.cc | |
| parent | 46976ca4e7393625fb25728d876e0c15b7e55c15 (diff) | |
Working acquire code
Author: jgg
Date: 1998-11-05 07:21:35 GMT
Working acquire code
Diffstat (limited to 'apt-pkg/init.cc')
| -rw-r--r-- | apt-pkg/init.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index da11e3b40..f79668c54 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.9 1998/10/30 07:53:39 jgg Exp $ +// $Id: init.cc,v 1.10 1998/11/05 07:21:42 jgg Exp $ /* ###################################################################### Init - Initialize the package library @@ -46,7 +46,7 @@ bool pkgInitialize(Configuration &Cnf) Cnf.Set("Dir::Etc","/etc/apt/"); Cnf.Set("Dir::Etc::sourcelist","sources.list"); Cnf.Set("Dir::Etc::main","apt.conf"); - Cnf.Set("Dir::Bin::methods","/usr/lib/apt/metods"); + Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); // Read the main config file string FName = Cnf.FindFile("Dir::Etc::main"); @@ -57,7 +57,9 @@ bool pkgInitialize(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (ReadConfigFile(Cnf,FName) != true || ReadConfigFile(Cnf,Cfg) != true) + // Read both config files, either existing will be OK + if ((ReadConfigFile(Cnf,FName) != true) | + (ReadConfigFile(Cnf,Cfg) != true)) return false; if (Cnf.FindB("Debug::pkgInitialize",false) == true) |