1 files changed, 3 insertions, 82 deletions

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index c15332c7a..74f88640c 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -16,6 +16,7 @@
 #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>
@@ -320,88 +321,8 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
 	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];
-			char *tok_buf;
-			while (fgets(buf, sizeof(buf), dpkg) != NULL) {
-				char* arch = strtok_r(buf, " ", &tok_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_r(NULL, " ", &tok_buf);
-				}
-			}
-			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())