Исправлены шаблоны ревизий

7 years ago · 8e7eff0d15
parent a4f0a51df9
commit 8e7eff0d15
63 changed files with 9 additions and 5 deletions
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip
+# Calculate path=/var/lib name=calculate
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
@ -1,4 +1,4 @@
-# Calculate format=samba path=/var/lib/calculate name=ini.env ini(overlay-calculate.remerge)==
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)==

 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip ini(overlay-calculate.remerge)==100,20160101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/101
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/102
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/102
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/103
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/103
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/104
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/104
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/105
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/105
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/107
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/107
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/108
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/108
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/109
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/109
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/110
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/110
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/113
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/113
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/116
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/116
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/117
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/117
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/118
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/118
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/119
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/119
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/120
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/120
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/121
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/121
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/122
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/122
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/123
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/123
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/124
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/124
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/125
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/125
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/126
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/126
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/127
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/127
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/128
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/128
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/129
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/129
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/130
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/130
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/132
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/132
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/133
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/133
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/134
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/134
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/135
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/135
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/136
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/136
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/138
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/138
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/139
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/139
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/140
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/140
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/142
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/142
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/143
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/143
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/145
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/145
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/148
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/148
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/149
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/149
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/152
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/152
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/153
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/153
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/154
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/154
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/155
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/155
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/157
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/157
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/158
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/158
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/159
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/159
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/161
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/161
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/162
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/162
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/163
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/163
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/164
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/164
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/165
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/165
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/166
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/166
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/167
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/167
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/168
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/168
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/172
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/172
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/174
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/174
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/175
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/175
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/20160101
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/100-old/20160101
@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-#
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
@ -1 +1 @@
-# Calculate path=/var/lib name=calculate append=skip ini(overlay-calculate.remerge)=>20160101,20170101
+# Calculate append=skip ini(overlay-calculate.remerge)==20160101,20170101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213
@ -1,4 +1,4 @@
-# Calculate format=samba name=ini.env merge=net-print/hplip ini(overlay-calculate.remerge)<#-cl_pass_file-#
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-print/hplip

 [overlay-calculate]
 remerge = #-cl_pass_file-#
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/old/.calculate_directory
@ -1 +0,0 @@
-# Calculate path=/var/lib name=calculate append=skip ini(overlay-calculate.remerge)=>100,200
				`@ -0,0 +1 @@`
				`# Calculate append=skip ini(overlay-calculate.remerge)==100,20160101`
				`@ -1 +0,0 @@`
				`# Calculate path=/var/lib name=calculate append=skip ini(overlay-calculate.remerge)=>100,200`