josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Johannes Schauer 2016-12-05 14:56:46 +01:00 committed by Johannes 'josch' Schauer
parent 34ab336d0f
commit 45d773e38b
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -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 multistrap (2.2.5) unstable; urgency=medium
* Remove Neil Williams from Uploaders * Remove Neil Williams from Uploaders

2
multistrap
View file

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