From c4d1ab98921cddc8bd01f1e23ec1f4f9e7d2a90a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 30 Aug 2015 12:14:06 +0200 Subject: implement $(NATIVE_ARCHITECTURE) substvar for indextargets --- apt-pkg/deb/debmetaindex.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'apt-pkg/deb/debmetaindex.cc') diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 08d8ef05e..419de12e8 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -133,6 +133,7 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI, DefCompressionTypes = os.str(); } } + std::string const NativeArch = _config->Find("APT::Architecture"); bool const GzipIndex = _config->FindB("Acquire::GzipIndexes", false); for (std::vector::const_iterator E = entries.begin(); E != entries.end(); ++E) { @@ -170,6 +171,10 @@ static void GetIndexTargetsFor(char const * const Type, std::string const &URI, Options.insert(std::make_pair("LANGUAGE", *L)); if (tplMetaKey.find("$(ARCHITECTURE)") != std::string::npos) Options.insert(std::make_pair("ARCHITECTURE", *A)); + else if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos) + Options.insert(std::make_pair("ARCHITECTURE", NativeArch)); + if (tplMetaKey.find("$(NATIVE_ARCHITECTURE)") != std::string::npos) + Options.insert(std::make_pair("NATIVE_ARCHITECTURE", NativeArch)); std::string MetaKey = tplMetaKey; std::string ShortDesc = tplShortDesc; -- cgit v1.2.3