]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge pull request #532 from mtmail/PSR2-namespaces
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 16 Sep 2016 19:55:44 +0000 (21:55 +0200)
committerGitHub <noreply@github.com>
Fri, 16 Sep 2016 19:55:44 +0000 (21:55 +0200)
add namespaces, method visibility according to PSR2 standard

vagrant/install-on-ubuntu-16.sh

index a4b9ddee8ad993bc8f14c8d7b18fb6e612f9c48b..b40dbce1abaa10add924da4983cc14fff0cc80e9 100755 (executable)
@@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 
     sudo apt-get update -qq
-    sudo apt-get -o Dpkg::Options::="--force-confnew" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
+    sudo apt-get -o Dpkg::Options::="--force-confold" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
 
 # Now you can install all packages needed for Nominatim: