33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
|
diff -u -r ../upstream.git/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc
|
||
|
|
--- ../upstream.git/apt-pkg/aptconfiguration.cc 2014-04-25 13:39:00.000000000 +0200
|
||
|
|
+++ ./apt-pkg/aptconfiguration.cc 2014-06-03 11:39:43.931774391 +0200
|
||
|
|
@@ -193,7 +193,7 @@
|
||
|
|
// get the environment language codes: LC_MESSAGES (and later LANGUAGE)
|
||
|
|
// we extract both, a long and a short code and then we will
|
||
|
|
// check if we actually need both (rare) or if the short is enough
|
||
|
|
- string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
|
||
|
|
+ string const envMsg = "en_US.UTF-8"; // string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
|
||
|
|
size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2;
|
||
|
|
size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3);
|
||
|
|
|
||
|
|
@@ -405,8 +405,8 @@
|
||
|
|
// setDefaultConfigurationForCompressors /*{{{*/
|
||
|
|
void Configuration::setDefaultConfigurationForCompressors() {
|
||
|
|
// Set default application paths to check for optional compression types
|
||
|
|
- _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
|
||
|
|
- _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
|
||
|
|
+ _config->CndSet("Dir::Bin::bzip2", "bin/bzip2");
|
||
|
|
+ _config->CndSet("Dir::Bin::xz", "bin/xz");
|
||
|
|
if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
|
||
|
|
_config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz"));
|
||
|
|
_config->Set("APT::Compressor::lzma::Binary", "xz");
|
||
|
|
@@ -419,7 +419,7 @@
|
||
|
|
_config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
|
||
|
|
}
|
||
|
|
} else {
|
||
|
|
- _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
|
||
|
|
+ _config->CndSet("Dir::Bin::lzma", "bin/lzma");
|
||
|
|
if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
|
||
|
|
_config->Set("APT::Compressor::lzma::CompressArg::", "--suffix=");
|
||
|
|
_config->Set("APT::Compressor::lzma::CompressArg::", "-9");
|