commit f9851ebd702685173017da79590d689cdaca1e7b Author: Хирецкий Михаил Date: Thu Dec 19 11:32:09 2019 +0300 Исправлен шаблон модуля синхронизации репозиториев calculate diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py index 64ac5fd20..e27a04166 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py +++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/__init__.py @@ -1,6 +1,6 @@ # Calculate run=/bin/bash -for dn in /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules +for dn in /usr/lib*/python*/site-packages/portage/sync/modules do [[ -d $dn ]] || continue [[ -d $dn/calculate ]] || mkdir -p $dn/calculate diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py index d4617a174..8e91d720d 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py +++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/calculate/calculate.py @@ -1,6 +1,6 @@ # Calculate run=/bin/bash -for dn in /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules +for dn in /usr/lib*/python*/site-packages/portage/sync/modules do [[ -d $dn ]] || continue [[ -d $dn/calculate ]] || mkdir -p $dn/calculate diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents index c691b9e24..3b18808a5 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents +++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/portage/syncmodule/zz-contents @@ -1,3 +1,5 @@ # Calculate format=contents -sys-apps/portage /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules/calculate -sys-apps/portage /usr/#-os_install_lib_path-#/python*/site-packages/portage/sync/modules/calculate/* +sys-apps/portage /usr/lib/python*/site-packages/portage/sync/modules/calculate +sys-apps/portage /usr/lib/python*/site-packages/portage/sync/modules/calculate/* +sys-apps/portage /usr/lib64/python*/site-packages/portage/sync/modules/calculate +sys-apps/portage /usr/lib64/python*/site-packages/portage/sync/modules/calculate/*