From 0d72ff8a38b0d4f5cfcf9869eabb003b97991fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 15 Dec 2016 16:53:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20revision,=20remerge,=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.5/6_ac_update_sync/remerge/10-old/.calculate_directory | 2 +- profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 | 4 ---- .../3.5/6_ac_update_sync/remerge/2016/.calculate_directory | 2 +- .../3.5/6_ac_update_sync/revision/10-old/.calculate_directory | 2 +- profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 | 4 ---- .../3.5/6_ac_update_sync/revision/2016/.calculate_directory | 2 +- .../world/update/100-old/.calculate_directory | 2 +- .../templates/3.5/6_ac_update_sync/world/update/100-old/299 | 3 --- .../6_ac_update_sync/world/update/2016/.calculate_directory | 2 +- 9 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 delete mode 100644 profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 delete mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 diff --git 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 index 0a8a959..27ba989 100644 --- 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 @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.remerge)<100 +# Calculate append=skip ini(overlay-distros.remerge)<20160101 diff --git 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 deleted file mode 100644 index bf1bb21..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate format=samba name=ini.env ini(overlay-distros.remerge)<#-cut()-# - -[overlay-distros] -remerge = 20160101 diff --git 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 index 3bc2f48..a380eff 100644 --- 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 append=skip ini(overlay-distros.remerge)==20160101,20170101 +# Calculate append=skip ini(overlay-distros.remerge)<20170101 diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory index 68d750b..f761ab8 100644 --- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.revision)<10 +# Calculate append=skip ini(overlay-distros.revision)<20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 deleted file mode 100644 index dfe8266..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 +++ /dev/null @@ -1,4 +0,0 @@ -# Calculate path=/var/lib/calculate name=ini.env format=samba ini(overlay-distros.revision)<#-cut()-# - -[overlay-distros] -revision = 20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory index f294955..1f506c2 100644 --- a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.revision)==20160101,20170101 +# Calculate append=skip ini(overlay-distros.revision)<20170101 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory index bde8a5c..86029cf 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.world)<300 +# Calculate append=skip ini(overlay-distros.world)<20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 deleted file mode 100644 index 1627ef8..0000000 --- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=world name=world ini(overlay-distros.world)<299 - -#-ini(overlay-distros.world,20160101)-# diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory index 12d2fa4..b938c51 100644 --- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory +++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip ini(overlay-distros.world)==20160101,20170101 +# Calculate append=skip ini(overlay-distros.world)<20170101