From 07058b5a292d47e6b86f8a96c8804555b82b5225 Mon Sep 17 00:00:00 2001 From: Manuel Tiago Pereira Date: Wed, 11 Nov 2015 18:11:24 +0000 Subject: [PATCH] Fix version checking for Debian repo for future versions. --- tasks/main.yml | 11 ++++------- vars/main.yml | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 0cb4908..76cc609 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,13 +16,10 @@ url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key state: present -- name: Check if nodejs_version is 4.x or higher - set_fact: debian_repo_version="4.x" - when: "{{ nodejs_version | version_compare('4.0', '>=') }}" - -- name: Check if nodejs_version is 5.x or higher - set_fact: debian_repo_version="5.x" - when: "{{ nodejs_version | version_compare('5.0', '>=') }}" +- name: Check if nodejs_version is 0.x + set_fact: + debian_repo_version: "{{ nodejs_version }}" + when: nodejs_version in nodejs_old_versions - name: Add NodeSource deb repository apt_repository: diff --git a/vars/main.yml b/vars/main.yml index fb00c88..3548acb 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,4 @@ --- # vars file for nodejs -debian_repo_version: "{{ nodejs_version }}" +nodejs_old_versions: ['0.10', '0.12'] +debian_repo_version: '{{ nodejs_version | regex_replace("^([1-9]+)\.\d+$", "\\1.x") }}'