[api] handle invalid double entries gracefully

openSUSE · Feb 10, 2015 · 858d2e9 · 858d2e9
1 parent 54337f7
commit 858d2e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/api/app/models/binary_release.rb b/src/api/app/models/binary_release.rb
@@ -141,7 +141,9 @@ def self.update_binary_releases_via_json(repository, json, time = Time.now)
              }
         # check for existing entry
         existing = oldlist.where(hash)
-        raise SaveError if existing.count > 1
+        Rails.logger.info "ERROR: multiple matches, cleaning up: #{existing.inspect}" if existing.count > 1
+        # double definition means broken DB entries
+        existing.offset(1).destroy_all
 
         # compare with existing entry
         if existing.count == 1

diff --git a/src/api/test/unit/code_quality_test.rb b/src/api/test/unit/code_quality_test.rb
@@ -68,7 +68,7 @@ def setup
   BlackList = {
       'ApplicationController#extract_ldap_user' => 116.66,
       'AttributeController#attribute_definition' => 87.7,
-      'BinaryRelease::update_binary_releases_via_json' => 122.54,
+      'BinaryRelease::update_binary_releases_via_json' => 128.58,
       'BranchPackage#find_packages_to_branch' => 234.73,
       'BranchPackage#create_branch_packages' => 214.0,
       'BranchPackage#determine_details_about_package_to_branch' => 124.62,