[jenkins-ci PATCH 2/3] lcitool: Fix flattening of pip mappings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Right now we're looping in the wrong place: instead of
unconditionally adding to the flattened list of pip packages and
then calling pip multiple times with that same list, we should
conditionally add items to the flattened list and then call pip
a single time with the result.

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 guests/playbooks/update/tasks/packages.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/guests/playbooks/update/tasks/packages.yml b/guests/playbooks/update/tasks/packages.yml
index 116c46d..fc8a3d1 100644
--- a/guests/playbooks/update/tasks/packages.yml
+++ b/guests/playbooks/update/tasks/packages.yml
@@ -121,6 +121,15 @@
   when:
     - pip_mappings[item]["default"] is defined
 
+- name: '{{ project }}: Remove unwanted pip mappings'
+  set_fact:
+    pip_resolved: '{{ pip_resolved|combine({ item: None }) }}'
+  with_items:
+    '{{ packages }}'
+  when:
+    - resolved[item] is defined
+    - resolved[item] != None
+
 - set_fact:
     pip_flattened: []
 
@@ -138,10 +147,3 @@
     name: '{{ pip_flattened|sort }}'
     executable: pip3
     state: '{{ state }}'
-  with_items:
-    '{{ packages }}'
-  when:
-    - resolved[item] is defined
-    - resolved[item] == None
-    - pip_resolved[item] is defined
-    - pip_resolved[item] != None
-- 
2.24.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux