Исправление в шаблонах

10 years ago · 88d353c8d2
parent b004c07c16
commit 88d353c8d2
27 changed files with 4 additions and 4 deletions
--- a/profiles/templates/3.1/.calculate_directory
+++ b/profiles/templates/3.1/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.1.1
--- a/profiles/templates/3.2/.calculate_directory
+++ b/profiles/templates/3.2/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.2.0.1
--- a/profiles/templates/3.2/6_ac_update_sync/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/.calculate_directory
--- a/profiles/templates/3.2/6_ac_update_sync/README-eng.txt
+++ b/profiles/templates/3.2/6_ac_update_sync/README-eng.txt
--- a/profiles/templates/3.2/6_ac_update_sync/README-rus.txt
+++ b/profiles/templates/3.2/6_ac_update_sync/README-rus.txt
--- a/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/.calculate_directory
--- a/profiles/templates/3.2/6_ac_update_sync/revision/01
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/01
--- a/profiles/templates/3.2/6_ac_update_sync/revision/02
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/02
--- a/profiles/templates/3.2/6_ac_update_sync/revision/03
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/03
--- a/profiles/templates/3.2/6_ac_update_sync/revision/04
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/04
--- a/profiles/templates/3.2/6_ac_update_sync/revision/05
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/05
--- a/profiles/templates/3.2/6_ac_update_sync/revision/06
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/06
--- a/profiles/templates/3.2/6_ac_update_sync/revision/07
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/07
--- a/profiles/templates/3.2/6_ac_update_sync/revision/08
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/08
--- a/profiles/templates/3.2/6_ac_update_sync/revision/09
+++ b/profiles/templates/3.2/6_ac_update_sync/revision/09
--- a/profiles/templates/3.2/6_ac_update_sync/world/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/.calculate_directory
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/.calculate_directory
--- a/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/ini.env
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/ini.env
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/.calculate_directory
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/.calculate_directory
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/01
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/01
@ -2,6 +2,6 @@

 #-ini(update.worldtest,1)-#

-#?os_linux_shortname==CLDX#
+#?in(os_linux_pkglist, CLDX)!=#
 x11-themes/greybird
 #os_linux_shortname#
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/02
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/02
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/03
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/03
@ -2,7 +2,7 @@

 #-ini(update.worldtest,1)-#

-#?in(os_linux_shortname,CLDX,CLD)!=#
+#?in(os_linux_pkglist,CLDX,CLD)!=#
 sys-apps/keyexec
 dev-qt/qtdbus
 #in#
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/04
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/04
@ -2,7 +2,7 @@

 #-ini(update.worldtest,4)-#

-#?os_linux_shortname==CLDX#
+#?in(os_linux_pkglist,CLDX)!=#
 !x11-themes/greybird
 media-gfx/lightdm-themes-calculate
 #os_linux_shortname#
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/05
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/05
--- a/profiles/templates/3.2/6_ac_update_sync/world/2_update/06
+++ b/profiles/templates/3.2/6_ac_update_sync/world/2_update/06
--- a/profiles/templates/3.2/README-eng.txt
+++ b/profiles/templates/3.2/README-eng.txt
--- a/profiles/templates/3.2/README-rus.txt
+++ b/profiles/templates/3.2/README-rus.txt
				`@ -1 +0,0 @@`
				`# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.1.1`
				`@ -0,0 +1 @@`
				`# Calculate append=skip cl_name==calculate-core&&cl_ver>=3.2.0.1`