[ticket/12318] Always install new config file on HHVM upgrade conflict.

PHPBB3-12318
This commit is contained in:
Andreas Fischer 2014-03-30 01:43:11 +01:00
parent a53312636a
commit d53c411d90

View file

@ -26,7 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
then then
# Upgrade to a recent stable version of HHVM # Upgrade to a recent stable version of HHVM
sudo apt-get install -y hhvm sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm
HHVM_LOG=$(realpath "$DIR")/hhvm.log HHVM_LOG=$(realpath "$DIR")/hhvm.log