Merge branch 'develop' of git.calculate-linux.org:calculate/calculate-overlay into develop

3 years ago · df90fa1f45
parent 4569475601 ae0ba7a854
commit df90fa1f45
3 changed files with 6 additions and 1 deletions
--- a/profiles/templates/3.6/2_ac_install_merge/Depends/python
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/python
@ -0,0 +1 @@
+# Calculate append=skip merge(dev-lang/python)!= merge=sys-apps/calculate-utils
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@ -2,4 +2,4 @@

 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20210615
+remerge = 20210615.1
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210615.1
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210615.1
@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/calculate-utils
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#
				`@ -0,0 +1 @@`
				`# Calculate append=skip merge(dev-lang/python)!= merge=sys-apps/calculate-utils`