X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/211ad09a3962946435369bc15a471320e3b13e70..5af95bd6e511c5b9f9e737b69b944fc00b60d42b:/cookbooks/nominatim/templates/default/updater.erb diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index 5c5a4448b..8a3cf027e 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -13,12 +13,14 @@ do ./utils/update.php --no-npi --import-osmosis + pushd <%= @srcdir %> if git fetch origin; then # will trigger recompilation if necessary git merge origin/<%= @branch %> else echo "WARNING: git fetch failed." fi + popd # sleep a bit if updates take less than a minute endtime=`date +%s`