projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fix typos in manpages. Thanks to Daniel Leidert for the fixes
[apt.git]
/
apt-pkg
/
init.cc
diff --git
a/apt-pkg/init.cc
b/apt-pkg/init.cc
index 6aa486a7f3d8b5650d6a6c4845681ef49cd8a1f6..338bef66c42a7c72236788e4c3c6563389ad2ade 100644
(file)
--- a/
apt-pkg/init.cc
+++ b/
apt-pkg/init.cc
@@
-14,6
+14,7
@@
#include <apti18n.h>
#include <config.h>
#include <apti18n.h>
#include <config.h>
+#include <cstdlib>
#include <sys/stat.h>
/*}}}*/
#include <sys/stat.h>
/*}}}*/
@@
-23,8
+24,6
@@
const char *pkgVersion = VERSION;
const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
Stringfy(APT_PKG_MINOR) "."
Stringfy(APT_PKG_RELEASE);
const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
Stringfy(APT_PKG_MINOR) "."
Stringfy(APT_PKG_RELEASE);
-const char *pkgCPU = COMMON_CPU;
-const char *pkgOS = COMMON_OS;
// pkgInitConfig - Initialize the configuration class /*{{{*/
// ---------------------------------------------------------------------
// pkgInitConfig - Initialize the configuration class /*{{{*/
// ---------------------------------------------------------------------
@@
-34,12
+33,10
@@
const char *pkgOS = COMMON_OS;
bool pkgInitConfig(Configuration &Cnf)
{
// General APT things
bool pkgInitConfig(Configuration &Cnf)
{
// General APT things
- if (strcmp(COMMON_OS,"linux") == 0 ||
- strcmp(COMMON_OS,"unknown") == 0)
- Cnf.Set("APT::Architecture",COMMON_CPU);
- else
- Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
+ Cnf.Set("APT::Architecture", COMMON_ARCH);
Cnf.Set("APT::Build-Essential::", "build-essential");
Cnf.Set("APT::Build-Essential::", "build-essential");
+ Cnf.Set("APT::Install-Recommends", true);
+ Cnf.Set("APT::Install-Suggests", false);
Cnf.Set("Dir","/");
// State
Cnf.Set("Dir","/");
// State
@@
-71,7
+68,14
@@
bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
-
+
+ // State
+ Cnf.Set("Dir::Log","var/log/apt");
+ Cnf.Set("Dir::Log::Terminal","term.log");
+
+ // Translation
+ Cnf.Set("APT::Acquire::Translation", "environment");
+
bool Res = true;
// Read an alternate config file
bool Res = true;
// Read an alternate config file
@@
-103,9
+107,6
@@
bool pkgInitConfig(Configuration &Cnf)
}
#endif
}
#endif
- // Translation
- Cnf.Set("APT::Acquire::Translation", "environment");
-
return true;
}
/*}}}*/
return true;
}
/*}}}*/