From: Matt Amos <zerebubuth@gmail.com>
Date: Fri, 24 Apr 2009 10:08:15 +0000 (+0000)
Subject: Patching better 412 error messages from mis-commit on old api06 branch.
X-Git-Tag: live~8273
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6c66507427961a22a8f282b5b2f4ab7fda1dad6f

Patching better 412 error messages from mis-commit on old api06 branch.
---

6c66507427961a22a8f282b5b2f4ab7fda1dad6f
diff --cc app/models/relation.rb
index 464d1646c,2032e6770..8a211b84f
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@@ -249,8 -249,8 +249,8 @@@ class Relation < ActiveRecord::Bas
  
    def update_from(new_relation, user)
      check_consistency(self, new_relation, user)
-     if !new_relation.preconditions_ok?
-       raise OSM::APIPreconditionFailedError.new
 -    unless preconditions_ok?
++    unless new_relation.preconditions_ok?
+       raise OSM::APIPreconditionFailedError.new("Cannot update relation #{self.id}: data or member data is invalid.")
      end
      self.changeset_id = new_relation.changeset_id
      self.changeset = new_relation.changeset