From 354f88d1af907d601215a795bd689883fd847cff Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 10 Sep 2019 13:27:26 +0200
Subject: [PATCH] Remove --allow-change-held-packages, probably not needed

---
 install_yunohost | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/install_yunohost b/install_yunohost
index 3d03b40..ce6f8ae 100755
--- a/install_yunohost
+++ b/install_yunohost
@@ -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
 }