diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-18 23:10:39 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-18 23:10:39 +0200 |
| commit | bfadca322501eae165b1fb525d1a377833630d34 (patch) | |
| tree | 224c4a14b152550f7e6296f08ad6c8ed477b77b6 | |
| parent | 75f87204da18afc2dda1be279b56e463ada35ca8 (diff) | |
| download | vyos-live-build-bfadca322501eae165b1fb525d1a377833630d34.tar.gz vyos-live-build-bfadca322501eae165b1fb525d1a377833630d34.zip | |
Correct keyring packages temporary workaround to not fail when aptitude is selected (Closes: #630919).
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 14423669d..5c6d690f1 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -497,13 +497,13 @@ EOF # Installing keyring packages if [ -n "${LB_KEYRING_PACKAGES}" ] then - # Temporary hack (FIXME) if [ "${LB_DERIVATIVE}" = "true" ] then - _APT="--force-yes" + # Temporary hack (FIXME) + Chroot "apt-get ${APT_OPTIONS} --force-yes install ${LB_KEYRING_PACKAGES}" + else + Apt chroot "install ${LB_KEYRING_PACKAGES}" fi - - Apt chroot "--force-yes install ${LB_KEYRING_PACKAGES}" fi rm -rf chroot/var/cache/apt/*.bin |