Set buildiso_ppafs in vars/ and move buildiso_ppa_path to tasks/

vcc-caeit · May 3, 2019 · b878e54 · b878e54
1 parent 4d80db3
commit b878e54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tasks/syncppa.yml b/tasks/syncppa.yml
@@ -5,6 +5,7 @@
     buildiso_ppa_url: "{{ buildiso_ppa | regex_replace('ppa:([a-z0-9-]+)/([a-z0-9-]+)', 'http://ppa.launchpad.net/\\1/\\2/ubuntu') }}"
     buildiso_ppa_name: "{{ buildiso_ppa | regex_replace('ppa:[a-z0-9-]+/([a-z0-9-]+)', '\\1') }}"
     buildiso_ppa_dist: "{{ '/dists/' + buildiso_dist + '/' }}"
+    buildiso_ppa_path: "{{ buildiso_ppafs + '/ppa' }}"
 
 - name: Fetch PPA information
   uri:

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,3 +1,3 @@
 ---
 buildiso_image: "{{ buildiso_output | regex_replace(buildiso_output | basename, buildiso_input | basename) }}"
-buildiso_ppa_path: "{{ buildiso_ppafs + '/ppa' }}"
+buildiso_ppafs: "{{ '/tmp/' + buildiso_output | basename | splitext | first + '.ppafs' }}"