Обновлены шаблоны ревизий, добавлена поддержка cl-update-profile 3.2.2

profiles/base/make.defaults

@@ -34,7 +34,7 @@ FEATURES="parallel-install -userpriv"
 FOO2ZJS_DEVICES="*"
 INPUT_DEVICES="${INPUT_DEVICES} mutouch synaptics"
 LDFLAGS="-Wl,--as-needed"
-LINGUAS="en bg de es fr it pl pt pt_BR ro ru ru_RU uk"
+LINGUAS="en bg de es es_ES fr it pl pt pt_BR ro ru ru_RU uk"
 NPTL_KERN_VER="3.12.0"
 PORTAGE_NICENESS=19
 PORTAGE_TMPDIR="/var/calculate/tmp"

profiles/templates/3.2/6_ac_update_sync/remerge/00-ini

@@ -0,0 +1,5 @@
+# Calculate format=samba path=/etc/calculate name=ini.env ini(update.remerge)==
+
+[update]
+# Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
+remerge = 1

profiles/templates/3.2/6_ac_update_sync/remerge/01

@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/baselayout,sys-kernel/dracut,sys-power/upower-pm-utils ini(update.remerge)<1
+
+[update]
+remerge = 1

profiles/templates/3.2/6_ac_update_sync/revision/01-clean_old_counters

@@ -1,8 +1,6 @@
 # Calculate ini(update.revision)<1 format=samba path=/etc/calculate name=ini.env
 
 [update]
-revision = 1
-world = 1
 !rev =
 !worldtest =
-!revtest =
+!revtest =

profiles/templates/3.2/6_ac_update_sync/revision/03

@@ -1,5 +0,0 @@
-# Calculate ini(update.revision)<3 format=samba path=/etc/calculate name=ini.env merge=sys-kernel/dracut,sys-power/upower-pm-utils
-
-# reconfigure dracut,upower
-[update]
-revision = 3

profiles/templates/3.2/6_ac_update_sync/revision/07

@@ -1,5 +0,0 @@
-# Calculate ini(update.revision)<7 format=samba path=/etc/calculate name=ini.env merge=sys-kernel/dracut
-
-# reconfigure dracut
-[update]
-revision = 7

profiles/templates/3.2/6_ac_update_sync/revision/08

@@ -1,5 +0,0 @@
-# Calculate ini(update.revision)<8 format=samba path=/etc/calculate name=ini.env merge=sys-apps/baselayout
-
-# update system version
-[update]
-revision = 8

profiles/templates/3.2/6_ac_update_sync/revision/09

@@ -1,5 +0,0 @@
-# Calculate ini(update.revision)<9 format=samba path=/etc/calculate name=ini.env
-
-[update]
-revision = 9
-!rev =

profiles/templates/3.2/6_ac_update_sync/revision/12-fix_cl-update

@@ -1,4 +1,4 @@
-# Calculate format=diff ini(update.revision)<12
+# Calculate format=diff pkg(sys-apps/calculate-update)<3.2.2&&ini(update.revision)<12
 #-ini(update.revision,12)-#
 --- /usr/lib/python2.7/site-packages/calculate/update/utils/cl_update.py
 +++ /usr/lib/python2.7/site-packages/calculate/update/utils/cl_update.py

profiles/templates/3.2/6_ac_update_sync/world/.calculate_directory

@@ -1 +1 @@
-# Calculate path=/var/lib name=portage cl_ver>=3.2&&os_linux_ver>=14
+# Calculate path=/var/lib name=portage

profiles/templates/3.2/6_ac_update_sync/world/0_create/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip cl_update_world==merge||cl_update_world==rebuild

profiles/templates/3.2/6_ac_update_sync/world/0_create/0-world

@@ -0,0 +1 @@
+# Calculate append=remove cl_update_world==rebuild name=world

profiles/templates/3.2/6_ac_update_sync/world/0_create/ini.env

@@ -0,0 +1,9 @@
+# Calculate path=/etc/calculate format=samba
+
+[update]
+#?cl_update_world==merge#
+world = 11
+#cl_update_world#
+#?cl_update_world==rebuild#
+!world =
+#cl_update_world#

profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip cl_update_world==rebuild

profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/ini.env

@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate format=samba
-
-[update]
-!world =

profiles/templates/3.2/6_ac_update_sync/world/0_rebuild/world

@@ -1 +0,0 @@
-# Calculate append=remove

profiles/templates/3.2/6_ac_update_sync/world/1_create/.calculate_directory

@@ -1 +0,0 @@
-# Calculate append=skip ini(update.world)==

profiles/templates/3.2/6_ac_update_sync/world/1_create/ini.env

@@ -1,4 +0,0 @@
-# Calculate path=/etc/calculate format=samba
-
-[update]
-world = 11

profiles/templates/3.2/6_ac_update_sync/world/1_update/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip cl_update_world!=merge&&cl_update_world!=rebuild