From 6384116ce931c6fcc64baf1690631b796b2b8228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Fri, 29 Oct 2010 12:19:29 +0400 Subject: [PATCH] Bugfix. --- pym/cl_api.py | 8 +++++++- pym/cl_template.py | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pym/cl_api.py b/pym/cl_api.py index 43ea13b..6374c5a 100644 --- a/pym/cl_api.py +++ b/pym/cl_api.py @@ -241,10 +241,16 @@ class _allPkg(object): self._listPkgObjReverse = listPkgObj[:] self._listPkgObjReverse.sort(smpPrioritetReverse) + def APIList(self): + return self._listPkgObjNormal + + def APIListReverse(self): + return self._listPkgObjReverse def __getattribute__(self, attr): if attr.startswith("__") or\ - attr in ('_listPkgObjNormal','_listPkgObjReverse'): + attr in ('_listPkgObjNormal', '_listPkgObjReverse', + 'APIList', 'APIListReverse'): value = object.__getattribute__(self, attr) else: if attr.startswith('stop') or attr.startswith('del'): diff --git a/pym/cl_template.py b/pym/cl_template.py index b3124d9..92b64e8 100644 --- a/pym/cl_template.py +++ b/pym/cl_template.py @@ -3501,6 +3501,11 @@ re.M|re.S) if configPath and self.protectPaths: flagFoundPath = False for protectPath in self.protectPaths: + if self._baseDir != "/": + lenBaseDir = len(self._baseDir) + if len(configPath)>lenBaseDir and\ + configPath[:lenBaseDir] == self._baseDir: + configPath = configPath[lenBaseDir:] if configPath.startswith(protectPath + "/"): flagFoundPath = True break