Adapt multiple keyring support for 'first-time usage'
git-svn-id: http://emdebian.org/svn/current@8063 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
parent
9e5afa7223
commit
cb723c94f1
1 changed files with 5 additions and 5 deletions
10
multistrap
10
multistrap
|
@ -307,13 +307,13 @@ if ((defined $k) and (not defined $noauth)) {
|
|||
die (_g("Secure Apt handling failed - try without authentication."))
|
||||
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}");
|
||||
}
|
||||
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 .= " -o Apt::Architecture=$arch";
|
||||
|
|
Loading…
Reference in a new issue