From 6131b08d957d6808a57ba6647e5e60a057ee1e5a Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 21 Sep 2013 10:11:22 +0200 Subject: [PATCH] only git fetch should be non-fatal, merge errors still need to be caught --- cookbooks/nominatim/templates/default/updater.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index acadc9a02..2f75b4199 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -15,9 +15,11 @@ do ./utils/update.php --no-npi --import-osmosis - # will trigger recompilation if necessary - if ! git pull; then - echo "WARNING: git update failed." + 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 -- 2.43.2