| 1 | diff -u -r ../apt-1.1.3/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc |
| 2 | --- ../apt-1.1.3/apt-pkg/aptconfiguration.cc 2015-11-30 03:08:24.000000000 -0500 |
| 3 | +++ ./apt-pkg/aptconfiguration.cc 2015-12-03 18:16:35.167212811 -0500 |
| 4 | @@ -35,8 +35,8 @@ |
| 5 | // setDefaultConfigurationForCompressors /*{{{*/ |
| 6 | static void setDefaultConfigurationForCompressors() { |
| 7 | // Set default application paths to check for optional compression types |
| 8 | - _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2"); |
| 9 | - _config->CndSet("Dir::Bin::xz", "/usr/bin/xz"); |
| 10 | + _config->CndSet("Dir::Bin::bzip2", "bin/bzip2"); |
| 11 | + _config->CndSet("Dir::Bin::xz", "bin/xz"); |
| 12 | if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) { |
| 13 | _config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz")); |
| 14 | _config->Set("APT::Compressor::lzma::Binary", "xz"); |
| 15 | @@ -49,7 +49,7 @@ |
| 16 | _config->Set("APT::Compressor::lzma::UncompressArg::", "-d"); |
| 17 | } |
| 18 | } else { |
| 19 | - _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma"); |
| 20 | + _config->CndSet("Dir::Bin::lzma", "bin/lzma"); |
| 21 | if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) { |
| 22 | _config->Set("APT::Compressor::lzma::CompressArg::", "--suffix="); |
| 23 | _config->Set("APT::Compressor::lzma::CompressArg::", "-9"); |
| 24 | @@ -218,7 +218,7 @@ |
| 25 | // get the environment language codes: LC_MESSAGES (and later LANGUAGE) |
| 26 | // we extract both, a long and a short code and then we will |
| 27 | // check if we actually need both (rare) or if the short is enough |
| 28 | - string const envMsg = string(Locale == 0 ? ::setlocale(LC_MESSAGES, NULL) : *Locale); |
| 29 | + string const envMsg = "en_US.UTF-8"; // string(Locale == 0 ? ::setlocale(LC_MESSAGES, NULL) : *Locale); |
| 30 | size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; |
| 31 | size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3); |
| 32 | |