From 70c56a1831e89f76969de96d37d6254b6ee3fdb2 Mon Sep 17 00:00:00 2001 From: Gilad Peleg Date: Sun, 30 Apr 2017 18:01:11 +0300 Subject: [PATCH] Run consistent logic with pip_version latest Also fixes the warning for not using jinja2 template in `when` conditions --- tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 5ba4b77..c8d57f7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,16 +29,16 @@ register: pip_installed_version changed_when: false check_mode: no - when: pip_version != None or pip_version != "LATEST" + when: pip_version or (pip_version | lower) != "latest" - name: Install required version of pip. command: "{{ pip }} install pip=={{ pip_version }}" become: yes - when: pip_version != None and pip_installed_version.stdout != pip_version and "{{ pip_version | lower}}" != "latest" + when: pip_version and pip_installed_version.stdout != pip_version and (pip_version | lower) != "latest" - name: Upgrade to latest version of pip. command: "{{ pip }} {{ '--proxy=' + pip_proxy + ' ' if pip_proxy != '' else '' }}install -U pip" register: pip_latest_output become: yes changed_when: pip_latest_output.stdout.find('Requirement already up-to-date') == -1 - when: (pip_version == None or pip_version == "LATEST") + when: not pip_version or (pip_version | lower) == "latest"