File tree 1 file changed +20
-6
lines changed
1 file changed +20
-6
lines changed Original file line number Diff line number Diff line change @@ -826,14 +826,27 @@ sub create-cro-app ($pool) {
826
826
my @ vars ;
827
827
828
828
for (% project-conf <vars ><> || []) -> $ v {
829
-
830
- if ($ v <group > && % project-conf <group_vars ><>. Bag ∩ $ v <group ><>. Bag ) {
831
- say " { $ v <name >} group:{ $ v <group >} is added by group condition ..." ;
829
+
830
+ my $ pass = False ;
831
+
832
+ if ($ group ) {
833
+ for ($ v <group >|| [])<> -> $ i {
834
+ if $ i eq $ group {
835
+ $ pass = True ;
836
+ last ;
837
+ }
838
+ }
832
839
} else {
833
- say " { $ v <name >} group:{ ($ v <group >|| []). perl } is filtered out by group condition ..." ;
834
- next ;
840
+ $ pass = True
835
841
}
836
842
843
+ if $ pass {
844
+ say " { $ v <name >} is added to final vars" ;
845
+ } else {
846
+ next ;
847
+ say " { $ v <name >} is filtered out from final vars" ;
848
+ }
849
+
837
850
@ vars . push ($ v );
838
851
839
852
if $ v <default > {
@@ -861,6 +874,7 @@ sub create-cro-app ($pool) {
861
874
}
862
875
}
863
876
}
877
+
864
878
if $ v <value > && $ v <value >. isa (Str ) {
865
879
for $ v <value > ~~ m :global /"%" (\S +? ) "%" / -> $ c {
866
880
my $ var_id = $ c [0 ]. Str ;
@@ -917,7 +931,7 @@ sub create-cro-app ($pool) {
917
931
http-root => sparky-http-root(),
918
932
sparky-tcp-port => sparky-tcp-port(),
919
933
group_vars => $ group ?? [] !! % project-conf <group_vars > || [],
920
- render-vars => $ group ?? True !! ( @ vars . elems > 0 ?? True !! False ),
934
+ render-vars => $ group ?? True !! (% project-conf < group_vars > ?? False !! True ),
921
935
css => css(),
922
936
navbar => navbar($ user , $ token ),
923
937
project => $ project ,
You can’t perform that action at this time.
0 commit comments