Browse Source

repo_query: always include package_name in results

Update check_available_rpms to show a full package name being searched
for
Vadim Rutkovsky 7 years ago
parent
commit
cc7886be9f

+ 1 - 1
roles/lib_utils/library/repoquery.py

@@ -547,13 +547,13 @@ class Repoquery(RepoqueryCLI):
         rval = self._repoquery_cmd(repoquery_cmd, True, 'raw')
 
         # check to see if there are actual results
+        rval['package_name'] = self.name
         if rval['results']:
             processed_versions = Repoquery.process_versions(rval['results'].strip())
             formatted_versions = self.format_versions(processed_versions)
 
             rval['package_found'] = True
             rval['versions'] = formatted_versions
-            rval['package_name'] = self.name
 
             if self.verbose:
                 rval['raw_versions'] = processed_versions

+ 1 - 1
roles/lib_utils/src/class/repoquery.py

@@ -128,13 +128,13 @@ class Repoquery(RepoqueryCLI):
         rval = self._repoquery_cmd(repoquery_cmd, True, 'raw')
 
         # check to see if there are actual results
+        rval['package_name'] = self.name
         if rval['results']:
             processed_versions = Repoquery.process_versions(rval['results'].strip())
             formatted_versions = self.format_versions(processed_versions)
 
             rval['package_found'] = True
             rval['versions'] = formatted_versions
-            rval['package_name'] = self.name
 
             if self.verbose:
                 rval['raw_versions'] = processed_versions

+ 1 - 1
roles/openshift_version/tasks/check_available_rpms.yml

@@ -6,5 +6,5 @@
   register: rpm_results
 
 - fail:
-    msg: "Package {{ openshift_service_type}} not found"
+    msg: "Package '{{ rpm_results.results.package_name }}' not found"
   when: not rpm_results.results.package_found