Merge pull request #5788 from saraycp/fix_serviceinfo

Fix serviceinfo nil case
openSUSE · Sep 6, 2018 · 65fe623 · 65fe623
2 parents 2af654a + 22f9995
commit 65fe623
Show file tree

Hide file tree

Showing 104 changed files with 5,376 additions and 3,773 deletions.
diff --git a/src/api/app/models/package.rb b/src/api/app/models/package.rb
@@ -1251,7 +1251,7 @@ def self.is_binary_file?(filename)
   def serviceinfo
     begin
       dir = Directory.hashed(project: project.name, package: name)
-      return dir['serviceinfo'] if dir
+      return dir.fetch('serviceinfo', {}) if dir
     rescue Backend::NotFoundError
     end
     {}

diff --git a/...ike_makes_a_user_a_maintainer_of_the_subject/makes_a_user_a_maintainer_of_the_package.yml b/...ike_makes_a_user_a_maintainer_of_the_subject/makes_a_user_a_maintainer_of_the_package.yml
diff --git a/...mmand/backend_response_fails/1_12_2_1.yml → ...mmand/backend_response_fails/1_13_2_1.yml b/...mmand/backend_response_fails/1_12_2_1.yml → ...mmand/backend_response_fails/1_13_2_1.yml
diff --git a/src/api/spec/cassettes/Package/_backend_build_command/backend_response_fails/has_errors.yml b/src/api/spec/cassettes/Package/_backend_build_command/backend_response_fails/has_errors.yml
diff --git a/.../when_response_is_successful/1_13_1_1.yml → ...ckend_response_is_successful/1_13_1_1.yml b/.../when_response_is_successful/1_13_1_1.yml → ...ckend_response_is_successful/1_13_1_1.yml