Add quotes, rename some things, try some more complex dependencies

2018-10-01 21:15:02 +00:00 · 2018-10-01 21:15:02 +00:00 · 6651ce408d
commit 6651ce408d
parent 9ba2cb2df0
7 changed files with 6 additions and 3 deletions
--- a/vars/all/FedoraBranched.yaml
+++ b/vars/all/FedoraBranched.yaml
@ -0,0 +1 @@
+FedoraBranched: True
--- a/vars/all/FedoraBranchedNumber.yaml
+++ b/vars/all/FedoraBranchedNumber.yaml
@ -1 +1 @@
-FedoraBranchedNumber: {{ FedoraCycleNumber + 1 }}|int
+FedoraBranchedNumber: "{{ FedoraCycleNumber + 1 }}|int"
--- a/vars/all/FedoraOldCycleNumber.yaml
+++ b/vars/all/FedoraOldCycleNumber.yaml
@ -1 +0,0 @@
-FedoraOldCycleNumber: {{ FedoraCycleNumber - 1 }}|int
--- a/vars/all/FedoraPreviousCycleNumber.yaml
+++ b/vars/all/FedoraPreviousCycleNumber.yaml
@ -0,0 +1 @@
+FedoraPreviousCycleNumber: "{{ FedoraCycleNumber - 1 }}|int"
--- a/vars/all/FedoraPreviousPrevious.yaml
+++ b/vars/all/FedoraPreviousPrevious.yaml
@ -0,0 +1 @@
+FedoraPreviousPrevious: False
--- a/vars/all/FedoraPreviousPreviousCycleNumber.yaml
+++ b/vars/all/FedoraPreviousPreviousCycleNumber.yaml
@ -0,0 +1 @@
+FedoraPreviousPreviousCycleNumber: "{{ FedoraCycleNumber - 1 }}|int"
--- a/vars/all/FedoraRawhideNumber.yaml
+++ b/vars/all/FedoraRawhideNumber.yaml
@ -1 +1 @@
-FedoraRawhideNumber: {{ FedoraBranchedNumber + 1 }}|int
+FedoraRawhideNumber: "{{ if FedoraBranched is True FedoraBranchedNumber + 1 else FedoraCycleNumber + 1 }}|int"
				`@ -1 +0,0 @@`
				`FedoraOldCycleNumber: {{ FedoraCycleNumber - 1 }}\|int`
				`@ -0,0 +1 @@`
				`FedoraPreviousCycleNumber: "{{ FedoraCycleNumber - 1 }}\|int"`
				`@ -0,0 +1 @@`
				`FedoraPreviousPreviousCycleNumber: "{{ FedoraCycleNumber - 1 }}\|int"`