parent
2760e6c074
commit
2ae28f8501
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2.2"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.12
|
||||
!<sys-apps/calculate-lib-2.1.8-r1
|
||||
!=sys-apps/calculate-lib-2.1.9
|
||||
!=sys-apps/calculate-lib-2.1.10
|
||||
!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix trackback fall in detect initrd
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.12-fix_traceback_initrd.patch"
|
||||
# fix get type by magic module
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.12-fix_magic_type.patch"
|
||||
# add exec option for template
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.12-exec_option.patch"
|
||||
}
|
||||
@ -0,0 +1,153 @@
|
||||
commit ced929a1261a4087c90338b2d9728a76d361c289
|
||||
Author: Самоукин Алексей <as@calculate.ru>
|
||||
Date: Mon Apr 4 11:03:14 2011 +0400
|
||||
|
||||
Add header parametr exec.
|
||||
|
||||
diff --git a/pym/cl_template.py b/pym/cl_template.py
|
||||
index a49a4d9..7ccb5f5 100644
|
||||
--- a/pym/cl_template.py
|
||||
+++ b/pym/cl_template.py
|
||||
@@ -436,7 +436,7 @@ class fileHeader(_terms):
|
||||
# Допустимые параметры заголовка
|
||||
allowParam = ["format", "format_conf", "comment", "append", "force",
|
||||
"link", "mirror", "symbolic", "chmod", "chown", "name",
|
||||
- "path", "autoupdate"]
|
||||
+ "path", "autoupdate", "exec"]
|
||||
|
||||
# Тип шаблона
|
||||
fileType = ""
|
||||
@@ -562,6 +562,9 @@ class fileHeader(_terms):
|
||||
self.headerTerm = False
|
||||
self.setError(_("incorrect header parameters - '%s'")\
|
||||
%"append=%s"%self.params["append"])
|
||||
+ if 'exec' in self.params:
|
||||
+ self.execStr = "#!%s"%self.params['exec']
|
||||
+
|
||||
if not incorrectParams and self.params:
|
||||
incorrectParams = set(self.params.keys()) - set(self.allowParam)
|
||||
if incorrectParams:
|
||||
@@ -3549,9 +3552,16 @@ re.M|re.S)
|
||||
self.autoUpdateFiles = []
|
||||
self.autoUpdateDirs = []
|
||||
|
||||
+
|
||||
+ def executeTemplate(self, path, execPath):
|
||||
+ """Execute template"""
|
||||
+ if os.system("""%s %s %s"""%(execPath,path,'>/dev/null 2>&1')) == 0:
|
||||
+ return True
|
||||
+ else:
|
||||
+ return False
|
||||
|
||||
- # Преобразование восьмеричного в целое (ввод строка, вывод число)
|
||||
def __octToInt(self, strOct):
|
||||
+ """Преобразование восьмеричного в целое (ввод строка, вывод число)"""
|
||||
if strOct:
|
||||
try:
|
||||
res = string.atoi(strOct, 8)
|
||||
@@ -4390,7 +4400,6 @@ variable 'cl_name'"))
|
||||
|
||||
# Родительская директория
|
||||
path = optFile["path"]
|
||||
-
|
||||
# Изменяем название родительской директории
|
||||
if "path" in objHeadNew.params:
|
||||
path = objHeadNew.params['path']
|
||||
@@ -4422,6 +4431,20 @@ variable 'cl_name'"))
|
||||
if realPath in self.filesFilter:
|
||||
return ([], False)
|
||||
typeAppendTemplate = objHeadNew.typeAppend
|
||||
+
|
||||
+ # Параметр exec
|
||||
+ if "exec" in objHeadNew.params:
|
||||
+ execPath = objHeadNew.params['exec']
|
||||
+ if not os.access(execPath,os.X_OK):
|
||||
+ self.setError(_("False value 'exec' in template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ self.setError(_("Can not execute %s") %execPath)
|
||||
+ return ([], False)
|
||||
+ if typeAppendTemplate == "join":
|
||||
+ self.setError(_("False value 'append=join' in template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ return ([], False)
|
||||
+
|
||||
# Очищаем оригинальный файл
|
||||
if typeAppendTemplate == "clear":
|
||||
try:
|
||||
@@ -4827,6 +4850,14 @@ variable 'cl_name'"))
|
||||
else:
|
||||
self.textConfig = title + self.textTemplate
|
||||
self.saveConfFile()
|
||||
+ if 'exec' in objHeadNew.params:
|
||||
+ if not self.executeTemplate(self.nameFileConfig,
|
||||
+ objHeadNew.params['exec']):
|
||||
+ self.setError(_("False template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ self.setError(_("Can not execute") + ": " +\
|
||||
+ self.nameFileConfig)
|
||||
+ return False
|
||||
return filesApply
|
||||
# Создаем объект в случае параметра format в заголовке
|
||||
if (typeAppendTemplate == "replace" or\
|
||||
@@ -4888,7 +4919,16 @@ variable 'cl_name'"))
|
||||
self.textTemplate
|
||||
else:
|
||||
self.textConfig = title + self.textTemplate
|
||||
+
|
||||
self.saveConfFile()
|
||||
+ if 'exec' in objHeadNew.params:
|
||||
+ if not self.executeTemplate(self.nameFileConfig,
|
||||
+ objHeadNew.params['exec']):
|
||||
+ self.setError(_("False template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ self.setError(_("Can not execute") + ": " +\
|
||||
+ self.nameFileConfig)
|
||||
+ return False
|
||||
return filesApply
|
||||
# Вверху
|
||||
elif typeAppendTemplate == "before":
|
||||
@@ -4909,6 +4949,14 @@ variable 'cl_name'"))
|
||||
self.textConfig = title + tmpTemplate
|
||||
|
||||
self.saveConfFile()
|
||||
+ if 'exec' in objHeadNew.params:
|
||||
+ if not self.executeTemplate(self.nameFileConfig,
|
||||
+ objHeadNew.params['exec']):
|
||||
+ self.setError(_("False template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ self.setError(_("Can not execute") + ": " +\
|
||||
+ self.nameFileConfig)
|
||||
+ return False
|
||||
return filesApply
|
||||
# Внизу
|
||||
elif typeAppendTemplate == "after":
|
||||
@@ -4928,6 +4976,14 @@ variable 'cl_name'"))
|
||||
else:
|
||||
self.textConfig = title + tmpTemplate
|
||||
self.saveConfFile()
|
||||
+ if 'exec' in objHeadNew.params:
|
||||
+ if not self.executeTemplate(self.nameFileConfig,
|
||||
+ objHeadNew.params['exec']):
|
||||
+ self.setError(_("False template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ self.setError(_("Can not execute") + ": " +\
|
||||
+ self.nameFileConfig)
|
||||
+ return False
|
||||
return filesApply
|
||||
# Объединение
|
||||
elif typeAppendTemplate == "join":
|
||||
@@ -5011,6 +5067,14 @@ variable 'cl_name'"))
|
||||
self.textTemplate = objTxtCoder.decode(self.textTemplate)
|
||||
self.textConfig = objTxtCoder.decode(self.textConfig)
|
||||
self.saveConfFile()
|
||||
+ if 'exec' in objHeadNew.params:
|
||||
+ if not self.executeTemplate(self.nameFileConfig,
|
||||
+ objHeadNew.params['exec']):
|
||||
+ self.setError(_("False template") + ": " +\
|
||||
+ nameFileTemplate)
|
||||
+ self.setError(_("Can not execute") + ": " +\
|
||||
+ self.nameFileConfig)
|
||||
+ return False
|
||||
return filesApply
|
||||
else:
|
||||
self.setError(_("False (type append) template") + ": " +\
|
||||
@ -1,2 +1,3 @@
|
||||
EBUILD calculate-utilities-2.2.12-r10.ebuild 841 RMD160 9c7db57d3c91b692ed6c380080a181287605b136 SHA1 e0dfefdac5b8f77193632430b46f0a6a65436931 SHA256 75cbfd6b96724189843c54e0af18d5c112e6e2f9ae4ab9eb089037284c767e0d
|
||||
MISC ChangeLog 5603 RMD160 f355f730e6ff6d9c3c736dd6157aacad6a8b3394 SHA1 9569cda75bf80e20e700d41938799a4c33c2b6cf SHA256 dbb1d1512552e7d0be16314c314735b04299ad5364546abddc20ef4077a2e087
|
||||
EBUILD calculate-utilities-2.2.12-r11.ebuild 841 RMD160 f493b4ec1b23f355798d14b6a7e1c4dfaa8a8445 SHA1 dfaccf9052b97b7166fd60e8df7b001c0f5308f5 SHA256 83b39d9521e813eef721d8a0a45a3b0bf295e1ed00021ae88f9d77345e9cb369
|
||||
MISC ChangeLog 5771 RMD160 90754dad530d80fe8cbbad5991e32331f0557a04 SHA1 04015f20494ebcd1a615154947c22a77de1a5a49 SHA256 a4280fcb2989ee654ffd06032f9e4fd4fda72ddd9a14ebff21f534218cfed4b6
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=2
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_client
|
||||
cl_desktop
|
||||
cl_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.12-r3
|
||||
=sys-apps/calculate-templates-2.2.12-r3
|
||||
=sys-apps/calculate-lib-2.2.12-r4
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.12-r2 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.12-r2 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.12 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.12 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.12 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.13 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue