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

Adapt multiple keyring support for 'first-time usage'

Browse source 
git-svn-id: http://emdebian.org/svn/current@8063 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-08-13 10:13:56 +00:00
parent 9e5afa7223
commit cb723c94f1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
multistrap
View file

@ -307,13 +307,13 @@ if ((defined $k) and (not defined $noauth)) {
die (_g("Secure Apt handling failed - try without authentication.")) die (_g("Secure Apt handling failed - try without authentication."))
if ($retval != 0); if ($retval != 0);
} }
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."));
}
system ("rm -rf ${xdir}"); 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");
}
} }
$config_str = ''; $config_str = '';
$config_str .= " -o Apt::Architecture=$arch"; $config_str .= " -o Apt::Architecture=$arch";