diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-21 13:55:05 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-25 11:58:47 -0400 |
| commit | dd28e90f183972cc2a395094ce3e3f72e861953f (patch) | |
| tree | dfe10fd66e0535763d953333ed49f6467762fbd6 /src/lib/Bcfg2/Client/Tools/POSIX | |
| parent | eec8f653c0235bde8d3a754802a4485f0d542ea3 (diff) | |
| download | bcfg2-dd28e90f183972cc2a395094ce3e3f72e861953f.tar.gz bcfg2-dd28e90f183972cc2a395094ce3e3f72e861953f.tar.bz2 bcfg2-dd28e90f183972cc2a395094ce3e3f72e861953f.zip | |
run pylint for errors on almost everything, full runs on some selected stuff
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/__init__.py | 7 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py index a0a8ac9f2..15acd2b3d 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py @@ -7,11 +7,8 @@ import shutil from datetime import datetime import Bcfg2.Client.Tools from Bcfg2.Compat import walk_packages -try: - from base import POSIXTool -except ImportError: - # py3k, incompatible syntax with py2.4 - exec("from .base import POSIXTool") +from Bcfg2.Client.Tools.POSIX.base import POSIXTool + class POSIX(Bcfg2.Client.Tools.Tool): """POSIX File support code.""" diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index 6952d0f7b..2fe6791ae 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -524,7 +524,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): except (OSError, KeyError): err = sys.exc_info()[1] self.logger.error("POSIX: Lookup of %s %s failed: %s" % - (scope, acl.qualifier, err)) + (atype, acl.qualifier, err)) qual = acl.qualifier existing[(atype, acl.tag_type, qual)] = \ self._norm_acl_perms(acl.permset) |