Merge pull request #29 from zerebubuth/routing-ui-tweaks-2

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index de2da3c6bfd3c55c705918c8e79e2e3b27a3226b..ca38d350148552ba5e8c85e1b2085ed9e20ec88a 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -241,7 +241,7 @@ class DiffReader
           if action_attributes["if-unused"]
             begin
               old.delete_with_history!(new, @changeset.user)
           if action_attributes["if-unused"]
             begin
               old.delete_with_history!(new, @changeset.user)

-            rescue OSM::APIPreconditionFailedError => ex
+            rescue OSM::APIAlreadyDeletedError, OSM::APIPreconditionFailedError => ex

               xml_result["new_id"] = old.id.to_s
               xml_result["new_version"] = old.version.to_s
             end
               xml_result["new_id"] = old.id.to_s
               xml_result["new_version"] = old.version.to_s
             end