diff options
author | Johannes Schauer <josch@debian.org> | 2016-12-03 16:16:03 +0100 |
---|---|---|
committer | Johannes Schauer <josch@debian.org> | 2016-12-03 16:16:03 +0100 |
commit | 1617caaad23b62df1c4fbcf2d4810c2f7a925839 (patch) | |
tree | ec0890c75653a68293b81b38262b4c1a85a38491 /multistrap | |
parent | 1c074ff4c15c0547a97bf3f72078c38159429098 (diff) |
Do not try to feed GPG keybox database version 1 files to apt (closes: #845963)
Diffstat (limited to 'multistrap')
-rwxr-xr-x | multistrap | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -24,6 +24,7 @@ use File::Basename; use Parse::Debian::Packages; use POSIX qw(locale_h); use Locale::gettext; +use File::Copy; use vars qw/ $progname $ourversion $dstrap $extra @aptsources $deb $cachedir $config_str %packages $retval $str $retries @@ -316,21 +317,10 @@ if ((defined $k) and (not defined $noauth)) { } foreach my $gpg (@files) { next if ($gpg =~ /removed/); - $retval = system ("gpg --no-default-keyring ". - "--homedir=${dir}/etc/apt/trusted.gpg.d/ ". - "--keyring=multistrap.gpg ". - " --import ${xdir}/usr/share/keyrings/${gpg} 2>/dev/null"); - $retval >>= 8; - die (_g("Secure Apt handling failed - try without authentication.")) - if ($retval != 0); + File::Copy::copy "${xdir}/usr/share/keyrings/${gpg}", "${dir}${etcdir}trusted.gpg.d/"; } system ("rm -rf ${xdir}"); } - if (-f "${dir}/etc/apt/trusted.gpg.d/multistrap.gpg") { - system_fatal ("cp ${dir}/etc/apt/trusted.gpg.d/multistrap.gpg ${dir}/etc/apt/trusted.gpg.d/trustdb.gpg"); - } else { - die (_g("Secure Apt handling failed - try without authentication.")."\n"); - } } $pre_config_str = ''; |