diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-08-01 19:51:20 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2007-08-01 19:51:20 -0300 |
| commit | 5b28c8040795b53a4df54f33e57976720558ed32 (patch) | |
| tree | 1e689cda085cf6252926cf2a28de453e10ac6acd /apt-pkg | |
| parent | 64a3bcac6e4ea6c166f254a1c0f15b23b5dd92dc (diff) | |
* Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
directory downloading on non-linux architectures (closes: #435597)
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/init.cc | 8 | ||||
| -rw-r--r-- | apt-pkg/init.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 2f15486d9..3ebd592c9 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -24,8 +24,6 @@ const char *pkgVersion = VERSION; 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 /*{{{*/ // --------------------------------------------------------------------- @@ -35,11 +33,7 @@ const char *pkgOS = COMMON_OS; 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::Install-Recommends", false); Cnf.Set("APT::Install-Suggests", false); diff --git a/apt-pkg/init.h b/apt-pkg/init.h index bc0e55036..b33d2db81 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -23,8 +23,6 @@ extern const char *pkgVersion; extern const char *pkgLibVersion; -extern const char *pkgOS; -extern const char *pkgCPU; bool pkgInitConfig(Configuration &Cnf); bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); |