Fix value for Dir::Etc::Trusted to point at trusted.gpg outside of trusted.gpg.d

debian/changelog

@@ -1,3 +1,10 @@
+multistrap (2.2.6) UNRELEASED; urgency=medium
+
+  * Fix value for Dir::Etc::Trusted to point at trusted.gpg outside of
+    trusted.gpg.d (Thanks, Steve Langasek)
+
+ -- Johannes Schauer <josch@debian.org>  Mon, 05 Dec 2016 14:55:43 +0100
+
 multistrap (2.2.5) unstable; urgency=medium
 
   * Remove Neil Williams from Uploaders

multistrap

@@ -316,7 +316,7 @@ close CONFIG;
 $config_str = '';
 $config_str .= " -o Apt::Architecture=" . shellescape($arch);
 $config_str .= " -o Dir::Etc::TrustedParts=" . shellescape("${dir}${etcdir}trusted.gpg.d");
-$config_str .= " -o Dir::Etc::Trusted=" . shellescape("${dir}${etcdir}trusted.gpg.d/trusted.gpg");
+$config_str .= " -o Dir::Etc::Trusted=" . shellescape("${dir}${etcdir}trusted.gpg");
 $config_str .= " -o Apt::Get::AllowUnauthenticated=true"
 	if (defined $noauth);
 $config_str .= " -o Apt::Get::Download-Only=true";