Merge "Add force-confdef in debian package install"

This commit is contained in:
Jenkins 2016-03-12 19:05:00 +00:00 committed by Gerrit Code Review
commit 63336d1f6f

View File

@ -40,7 +40,8 @@ install_deb_packages () {
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \ http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
no_proxy=${no_proxy:-} \ no_proxy=${no_proxy:-} \
apt-get --option "Dpkg::Options::=--force-confold" --assume-yes "$@" apt-get --option "Dpkg::Options::=--force-confold" \
--option "Dpkg::Options::=--force-confdef" --assume-yes "$@"
} }
TEMP=$(getopt -o hudem: -n $SCRIPTNAME -- "$@") TEMP=$(getopt -o hudem: -n $SCRIPTNAME -- "$@")