Merge pull request #25 from stackhpc/rpm-distribution-fixes

Sync some fixes from deb distribution work to RPM

Author: markgoddard

roles/pulp_distribution/tasks/rpm.yml

@@ -33,18 +33,19 @@
     # If another distribution is being promoted to this one:
     promoted_dist: "{{ pulp_dists_list.distributions | selectattr('name', 'equalto', item.distribution | default) }}"
     promoted_pub: "{{ pulp_pubs_list.publications | selectattr('pulp_href', 'equalto', (promoted_dist | first).publication | default) }}"
-    # Pick the right pubication based on the type of distribution.
-    pub: "{{ specific_pub | first if item.version is defined else promoted_pub | first if item.distribution is defined else latest_pub | first }}"
+    # Pick the right publication based on the type of distribution.
+    pubs: "{{ specific_pub if item.version is defined else promoted_pub if item.distribution is defined else latest_pub }}"
     # Whether any distributions exist for this publication.
-    pub_has_dists: "{{ pulp_dists_list.distributions | selectattr('publication', 'equalto', pub.pulp_href) | list | length > 0 }}"
+    pub_has_dists: >-
+      {{ pulp_dists_list.distributions | selectattr('publication', 'equalto', pubs[0].pulp_href if item.state == 'present' else None) | list | length > 0 }}
   pulp.squeezer.rpm_distribution:
     pulp_url: "{{ pulp_url }}"
     username: "{{ pulp_username }}"
     password: "{{ pulp_password }}"
     validate_certs: "{{ pulp_validate_certs | bool }}"
     name: "{{ item.name }}"
     base_path: "{{ item.base_path }}"
-    publication: "{{ pub.pulp_href if item.state == 'present' else omit }}"
+    publication: "{{ pubs[0].pulp_href if item.state == 'present' else omit }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_distribution_rpm }}"
   when: >-