Disable SMTP callout verification for telenav.com senders

[chef.git] / cookbooks / nominatim / templates / default / updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index c0a0ad49b6abbc5572b47c6d7459110647844610..2f75b4199638af23c8e9fb23e631ef587716f27b 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -15,8 +15,12 @@ do
 
     ./utils/update.php --no-npi --import-osmosis
 
-    # will trigger recompilation if necessary
-    git pull
+    if git fetch origin; then
+      # will trigger recompilation if necessary
+      git merge origin/master
+    else
+      echo "WARNING: git fetch failed."
+    fi
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`