only git fetch should be non-fatal, merge errors still need to be caught

[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 7443297e89b7b3650485ee36bbc8ed9a8a96554e..2f75b4199638af23c8e9fb23e631ef587716f27b 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,7 +3,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Send output to the log
-exec > /var/log/nominatim/update.log 2>&1
+exec >> /var/log/nominatim/update.log 2>&1
 
 # Change to Nominatim directory
 DIR="$( cd "$( dirname "$0" )" && pwd )"
@@ -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`