Изменена нумерация в remerge

7 years ago · f9165bc152
parent 26a8327c46
commit f9165bc152
4 changed files with 6 additions and 1 deletions
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
@ -2,4 +2,4 @@

 [overlay-distros]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20161213
+remerge = 20160101
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip ini(overlay-distros.remerge)<100
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99
@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-distros.remerge)<#-cut()-#
+
+[overlay-distros]
+remerge = 20160101
				`@ -0,0 +1 @@`
				`# Calculate append=skip ini(overlay-distros.remerge)<100`