projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move cmdline parsing from apt-cache to new FromCommandLine method
[apt.git]
/
apt-pkg
/
init.cc
diff --git
a/apt-pkg/init.cc
b/apt-pkg/init.cc
index 0aff882b6f01433c0fe112a254a8b97616658823..60281deb3687b70166402e53f77848cd7882c112 100644
(file)
--- a/
apt-pkg/init.cc
+++ b/
apt-pkg/init.cc
@@
-35,7
+35,7
@@
bool pkgInitConfig(Configuration &Cnf)
// General APT things
Cnf.Set("APT::Architecture", COMMON_ARCH);
Cnf.Set("APT::Build-Essential::", "build-essential");
// General APT things
Cnf.Set("APT::Architecture", COMMON_ARCH);
Cnf.Set("APT::Build-Essential::", "build-essential");
- Cnf.Set("APT::Install-Recommends",
fals
e);
+ Cnf.Set("APT::Install-Recommends",
tru
e);
Cnf.Set("APT::Install-Suggests", false);
Cnf.Set("Dir","/");
Cnf.Set("APT::Install-Suggests", false);
Cnf.Set("Dir","/");
@@
-65,34
+65,48
@@
bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
+ Cnf.Set("Dir::Etc::netrc", "auth.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
+ Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+ Cnf.Set("Dir::Media::MountPath","/media/apt");
// State
Cnf.Set("Dir::Log","var/log/apt");
// State
Cnf.Set("Dir::Log","var/log/apt");
- Cnf.Set("Dir::Log::Name","term.log");
-
+ Cnf.Set("Dir::Log::Terminal","term.log");
+ Cnf.Set("Dir::Log::History","history.log");
+
+ // Translation
+ Cnf.Set("APT::Acquire::Translation", "environment");
+
bool Res = true;
// Read an alternate config file
const char *Cfg = getenv("APT_CONFIG");
bool Res = true;
// Read an alternate config file
const char *Cfg = getenv("APT_CONFIG");
- if (Cfg != 0 && FileExists(Cfg) == true)
- Res &= ReadConfigFile(Cnf,Cfg);
-
+ if (Cfg != 0)
+ {
+ if (FileExists(Cfg) == true)
+ Res &= ReadConfigFile(Cnf,Cfg);
+ else
+ _error->WarningE("FileExists",_("Unable to read %s"),Cfg);
+ }
+
// Read the configuration parts dir
string Parts = Cnf.FindDir("Dir::Etc::parts");
// Read the configuration parts dir
string Parts = Cnf.FindDir("Dir::Etc::parts");
- if (
File
Exists(Parts) == true)
+ if (
Directory
Exists(Parts) == true)
Res &= ReadConfigDir(Cnf,Parts);
Res &= ReadConfigDir(Cnf,Parts);
-
+ else
+ _error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());
+
// Read the main config file
string FName = Cnf.FindFile("Dir::Etc::main");
if (FileExists(FName) == true)
Res &= ReadConfigFile(Cnf,FName);
// Read the main config file
string FName = Cnf.FindFile("Dir::Etc::main");
if (FileExists(FName) == true)
Res &= ReadConfigFile(Cnf,FName);
-
+
if (Res == false)
return false;
if (Res == false)
return false;
-
+
if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
Cnf.Dump();
if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
Cnf.Dump();
@@
-104,9
+118,6
@@
bool pkgInitConfig(Configuration &Cnf)
}
#endif
}
#endif
- // Translation
- Cnf.Set("APT::Acquire::Translation", "environment");
-
return true;
}
/*}}}*/
return true;
}
/*}}}*/