#include <apt-pkg/fileutl.h>
#include <apt-pkg/macros.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/pkgsystem.h>
#include <dirent.h>
#include <stdio.h>
#include <string>
#include <vector>
-#include <apti18n.h>
/*}}}*/
namespace APT {
// setDefaultConfigurationForCompressors /*{{{*/
}
// setup the defaults for the compressiontypes => method mapping
- _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
_config->CndSet("Acquire::CompressionTypes::xz","xz");
+ _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
_config->CndSet("Acquire::CompressionTypes::lzma","lzma");
_config->CndSet("Acquire::CompressionTypes::gz","gzip");
continue;
// ignore types we have no app ready to use
std::string const app = _config->Find(method);
- std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
- for (; c != compressors.end(); ++c)
- if (c->Name == app)
- break;
- if (c == compressors.end())
+ if (std::find_if(compressors.begin(), compressors.end(), [&app](APT::Configuration::Compressor const &c) {
+ return c.Name == app;
+ }) == compressors.end())
continue;
types.push_back(*o);
}
if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
continue;
// ignore types we have no app ready to use
- std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin();
- for (; c != compressors.end(); ++c)
- if (c->Name == Types->Value)
- break;
- if (c == compressors.end())
+ if (std::find_if(compressors.begin(), compressors.end(), [&Types](APT::Configuration::Compressor const &c) {
+ return c.Name == Types->Value;
+ }) == compressors.end())
continue;
types.push_back(Types->Tag);
}
string const arch = _config->Find("APT::Architecture");
archs = _config->FindVector("APT::Architectures");
- if (unlikely(arch.empty() == true))
- return archs;
-
- // FIXME: It is a bit unclean to have debian specific code here…
- if (archs.empty() == true) {
- archs.push_back(arch);
-
- // Generate the base argument list for dpkg
- std::vector<const char *> Args;
- string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
- {
- string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/");
- size_t dpkgChrootLen = dpkgChrootDir.length();
- if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0) {
- if (dpkgChrootDir[dpkgChrootLen - 1] == '/')
- --dpkgChrootLen;
- Tmp = Tmp.substr(dpkgChrootLen);
- }
- }
- Args.push_back(Tmp.c_str());
-
- // Stick in any custom dpkg options
- ::Configuration::Item const *Opts = _config->Tree("DPkg::Options");
- if (Opts != 0) {
- Opts = Opts->Child;
- for (; Opts != 0; Opts = Opts->Next)
- {
- if (Opts->Value.empty() == true)
- continue;
- Args.push_back(Opts->Value.c_str());
- }
- }
-
- Args.push_back("--print-foreign-architectures");
- Args.push_back(NULL);
-
- int external[2] = {-1, -1};
- if (pipe(external) != 0)
- {
- _error->WarningE("getArchitecture", "Can't create IPC pipe for dpkg --print-foreign-architectures");
- return archs;
- }
-
- pid_t dpkgMultiArch = ExecFork();
- if (dpkgMultiArch == 0) {
- close(external[0]);
- std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
- int const nullfd = open("/dev/null", O_RDONLY);
- dup2(nullfd, STDIN_FILENO);
- dup2(external[1], STDOUT_FILENO);
- dup2(nullfd, STDERR_FILENO);
- if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0 && chdir("/") != 0)
- _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --print-foreign-architectures", chrootDir.c_str());
- execvp(Args[0], (char**) &Args[0]);
- _error->WarningE("getArchitecture", "Can't detect foreign architectures supported by dpkg!");
- _exit(100);
- }
- close(external[1]);
-
- FILE *dpkg = fdopen(external[0], "r");
- if(dpkg != NULL) {
- char buf[1024];
- while (fgets(buf, sizeof(buf), dpkg) != NULL) {
- char* arch = strtok(buf, " ");
- while (arch != NULL) {
- for (; isspace(*arch) != 0; ++arch);
- if (arch[0] != '\0') {
- char const* archend = arch;
- for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
- string a(arch, (archend - arch));
- if (std::find(archs.begin(), archs.end(), a) == archs.end())
- archs.push_back(a);
- }
- arch = strtok(NULL, " ");
- }
- }
- fclose(dpkg);
- }
- ExecWait(dpkgMultiArch, "dpkg --print-foreign-architectures", true);
- return archs;
- }
+ if (archs.empty() == true)
+ archs = _system->ArchitecturesSupported();
if (archs.empty() == true ||
std::find(archs.begin(), archs.end(), arch) == archs.end())
#ifdef HAVE_ZLIB
else
compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2));
-#endif
- if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
- compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3));
-#ifdef HAVE_BZ2
- else
- compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 3));
#endif
if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
- compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4));
+ compressors.push_back(Compressor("xz",".xz","xz","-6","-d",3));
#ifdef HAVE_LZMA
else
- compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 4));
+ compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 3));
+#endif
+ if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
+ compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",4));
+#ifdef HAVE_BZ2
+ else
+ compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 4));
#endif
if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5));
projects / apt.git / blobdiff