From 5098998d64fbb657418b07dab2daec643466af2b Mon Sep 17 00:00:00 2001 From: Adam Reznechek Date: Tue, 20 Sep 2016 19:53:20 -0500 Subject: [PATCH] Update AIO script to support ubuntu-ports With the merge of [1], the way the bootstrap AIO script evaluates the sources.list file for ubuntu was changed, which inadvertently broke any distros using ubuntu-ports. This patch fixes the regex to support ubuntu-ports repos. [1] I7fab8f3c072e25fa8138c3e37d764b36d17526d6 Change-Id: I7ecd9dc130d194342e236bef42b08926f98940fd --- tests/roles/bootstrap-host/tasks/install-apt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/roles/bootstrap-host/tasks/install-apt.yml b/tests/roles/bootstrap-host/tasks/install-apt.yml index 4cc3ecb64d..09cfdb52cf 100644 --- a/tests/roles/bootstrap-host/tasks/install-apt.yml +++ b/tests/roles/bootstrap-host/tasks/install-apt.yml @@ -21,7 +21,7 @@ - apt-install-prerequisites - name: Determine the existing Ubuntu repo configuration - shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\/?)(?= {{ ansible_distribution_release }} main)" /etc/apt/sources.list' + shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\S*\/?)(?= {{ ansible_distribution_release }} main)" /etc/apt/sources.list' register: ubuntu_repo when: - bootstrap_host_ubuntu_repo is not defined @@ -30,7 +30,7 @@ - find-apt-repo - name: Determine the existing Ubuntu Security repo configuration - shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\/?)(?= {{ ansible_distribution_release }}-security main)" /etc/apt/sources.list' + shell: 'grep -oP "^deb \K(\[?.*\]?.*ubuntu\S*\/?)(?= {{ ansible_distribution_release }}-security main)" /etc/apt/sources.list' register: ubuntu_security_repo when: - bootstrap_host_ubuntu_security_repo is not defined