Remove --allow-change-held-packages, probably not needed

This commit is contained in:
Alexandre Aubin 2019-09-10 13:27:26 +02:00 committed by GitHub
parent 9a70790124
commit 354f88d1af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -259,7 +259,7 @@ function upgrade_system() {
# perl is yolomacnuggets :|
# Stuff like "Can't locate object method "new" via package "Text::Iconv""
apt_get_wrapper -o Dpkg::Options::="--force-confold" \
-y --allow-change-held-packages install \
-y install \
libtext-iconv-perl \
|| return 1
@ -278,7 +278,7 @@ function upgrade_system() {
if is_raspbian ; then
apt_get_wrapper -o Dpkg::Options::="--force-confold" \
-y --allow-change-held-packages install rpi-update \
-y install rpi-update \
|| return 3
if [[ "$BUILD_IMAGE" != "1" ]] ; then
@ -299,7 +299,7 @@ function install_script_dependencies() {
apt_update
apt_get_wrapper -o Dpkg::Options::="--force-confold" \
-y --allow-change-held-packages install \
-y install \
$DEPENDENCIES \
|| return 1
}
@ -477,7 +477,7 @@ function install_yunohost_packages() {
# c.f. https://github.com/YunoHost/issues/issues/1382
apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \
-y --allow-change-held-packages install \
-y install \
debhelper dh-autoreconf \
|| true
@ -485,7 +485,7 @@ function install_yunohost_packages() {
apt_get_wrapper \
-o Dpkg::Options::="--force-confold" \
-o APT::install-recommends=true \
-y --allow-change-held-packages install \
-y install \
yunohost yunohost-admin postfix \
|| return 1
}