From: Peter Rabbitson Date: Wed, 10 Aug 2016 13:14:41 +0000 (+0200) Subject: (travis) Fix unixodbc-dev overwrite on newer CI images X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=9ab03b7c122ecdf0779aaaa599423a6a92a8533a (travis) Fix unixodbc-dev overwrite on newer CI images --- diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash index 7f911ad..547fa8b 100755 --- a/maint/travis-ci_scripts/10_before_install.bash +++ b/maint/travis-ci_scripts/10_before_install.bash @@ -124,9 +124,11 @@ if [[ "$CLEANTEST" != "true" ]]; then "sudo dpkg -i $( echo ${manual_debs[@]/#/$CACHE_DIR/*/*/} ) || sudo bash -c 'source maint/travis-ci_scripts/common.bash && apt_install -f'" - # needs to happen separately and *after* db2exc, as the former shits all over /usr/include (wtf?!) - # for more info look at /opt/ibm/db2/V9.7/instance/db2iutil :: create_links() - apt_install unixodbc-dev + # Needs to happen separately and *after* db2exc, as the former shits all over /usr/include (wtf?!) + # For more info look at /opt/ibm/db2/V9.7/instance/db2iutil :: create_links() + # The --reinstall is there in case it was already in place and got destroyed + # (this is the case on newer trusty images) + apt_install --reinstall unixodbc-dev ### config memcached