Commit | Line | Data |
---|---|---|
dc111072 FF |
1 | --- ../cache/apt-1.4.7/apt-pkg/init.cc 2017-07-14 07:45:39.000000000 +1000 |
2 | +++ ./apt-pkg/init.cc 2017-07-19 17:03:07.949752843 +1000 | |
3 | @@ -51,7 +51,7 @@ | |
4 | return vec; | |
5 | } | |
6 | ||
7 | - | |
8 | +#ifndef __ANDROID__ | |
9 | // pkgInitArchTupleMap - Initialize the architecture tuple map /*{{{*/ | |
10 | // --------------------------------------------------------------------- | |
11 | /* This initializes */ | |
12 | @@ -116,7 +116,7 @@ | |
13 | ||
14 | return true; | |
15 | } | |
16 | - /*}}}*/ | |
17 | +#endif /*}}}*/ | |
18 | ||
19 | ||
20 | // pkgInitConfig - Initialize the configuration class /*{{{*/ | |
21 | @@ -133,6 +133,7 @@ | |
59f0d218 FF |
22 | Cnf.CndSet("APT::Install-Recommends", true); |
23 | Cnf.CndSet("APT::Install-Suggests", false); | |
dc111072 | 24 | Cnf.CndSet("Dir","/"); |
59f0d218 FF |
25 | + Cnf.CndSet("Acquire::Languages", "none"); |
26 | ||
27 | // State | |
dc111072 FF |
28 | Cnf.CndSet("Dir::State", STATE_DIR + 1); |
29 | @@ -158,9 +159,9 @@ | |
59f0d218 FF |
30 | Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg"); |
31 | Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d"); | |
dc111072 FF |
32 | Cnf.CndSet("Dir::Bin::methods", LIBEXEC_DIR "/methods"); |
33 | - Cnf.CndSet("Dir::Bin::solvers::",LIBEXEC_DIR "/solvers"); | |
34 | - Cnf.CndSet("Dir::Bin::planners::",LIBEXEC_DIR "/planners"); | |
59f0d218 | 35 | - Cnf.CndSet("Dir::Media::MountPath","/media/apt"); |
dc111072 FF |
36 | + Cnf.CndSet("Dir::Bin::solvers::",LIBEXEC_DIR "/solvers"); |
37 | + Cnf.CndSet("Dir::Bin::planners::", LIBEXEC_DIR "/planners"); | |
59f0d218 FF |
38 | + Cnf.CndSet("Dir::Media::MountPath","media/apt"); |
39 | ||
dc111072 FF |
40 | // State |
41 | Cnf.CndSet("Dir::Log", LOG_DIR + 1); | |
42 | @@ -283,8 +284,6 @@ | |
43 | return _error->Error(_("Unable to determine a suitable packaging system type")); | |
44 | } | |
45 | ||
46 | - if (pkgInitArchTupleMap() == false) | |
47 | - return false; | |
48 | ||
49 | return Sys->Initialize(Cnf); | |
50 | } |