summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Client')
-rw-r--r--src/lib/Bcfg2/Client/Tools/APK.py8
-rw-r--r--src/lib/Bcfg2/Client/Tools/Action.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/IPS.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/__init__.py7
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/base.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/Pacman.py1
-rw-r--r--src/lib/Bcfg2/Client/Tools/SELinux.py2
-rw-r--r--src/lib/Bcfg2/Client/Tools/VCS.py12
-rw-r--r--src/lib/Bcfg2/Client/Tools/YUMng.py6
-rw-r--r--src/lib/Bcfg2/Client/Tools/__init__.py3
-rw-r--r--src/lib/Bcfg2/Client/XML.py7
11 files changed, 31 insertions, 21 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py
index d70916792..9c7692dbb 100644
--- a/src/lib/Bcfg2/Client/Tools/APK.py
+++ b/src/lib/Bcfg2/Client/Tools/APK.py
@@ -42,10 +42,10 @@ class APK(Bcfg2.Client.Tools.PkgTool):
#FIXME: Does APK have any sort of verification mechanism?
return True
else:
- self.loggger.info(" pkg %s at version %s, not %s" %
- (entry.attrib['name'],
- self.installed[entry.attrib['name']],
- entry.attrib['version']))
+ self.logger.info(" pkg %s at version %s, not %s" %
+ (entry.attrib['name'],
+ self.installed[entry.attrib['name']],
+ entry.attrib['version']))
entry.set('current_version', self.installed[entry.get('name')])
return False
entry.set('current_exists', 'false')
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index 31d3a1971..4f4fdc3b2 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -80,7 +80,7 @@ class Action(Bcfg2.Client.Tools.Tool):
return True
def InstallPostInstall(self, entry):
- return self.InstallAction(self, entry)
+ return self.InstallAction(entry)
def BundleUpdated(self, bundle, states):
"""Run postinstalls when bundles have been updated."""
diff --git a/src/lib/Bcfg2/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py
index e30bbd2a4..730f4c2d9 100644
--- a/src/lib/Bcfg2/Client/Tools/IPS.py
+++ b/src/lib/Bcfg2/Client/Tools/IPS.py
@@ -1,7 +1,9 @@
"""This is the Bcfg2 support for OpenSolaris packages."""
+# pylint: disable=F0401
import pkg.client.image as image
import pkg.client.progress as progress
+# pylint: enable=F0401
import Bcfg2.Client.Tools
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)
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index c8c05061c..02889a2e7 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -1,5 +1,6 @@
"""This is the bcfg2 support for pacman"""
+import sys
import Bcfg2.Client.Tools
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index babdaf6bf..11172d25f 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -235,7 +235,7 @@ class SELinuxEntryHandler(object):
return getattr(self, "_%sargs" % method)(entry)
elif hasattr(self, "_defaultargs"):
# default args
- return self._defaultargs(entry)
+ return self._defaultargs(entry) # pylint: disable=E1101
else:
raise NotImplementedError
diff --git a/src/lib/Bcfg2/Client/Tools/VCS.py b/src/lib/Bcfg2/Client/Tools/VCS.py
index e6081dc1c..790ac787a 100644
--- a/src/lib/Bcfg2/Client/Tools/VCS.py
+++ b/src/lib/Bcfg2/Client/Tools/VCS.py
@@ -9,18 +9,21 @@ missing = []
import os
import shutil
import sys
+
+# pylint: disable=F0401
# python-dulwich git imports
try:
import dulwich
import dulwich.index
from dulwich.errors import NotGitRepository
-except:
+except ImportError:
missing.append('git')
# subversion import
try:
import pysvn
-except:
+except ImportError:
missing.append('svn')
+# pylint: enable=F0401
import Bcfg2.Client.Tools
@@ -123,13 +126,14 @@ class VCS(Bcfg2.Client.Tools.Tool):
def Installsvn(self, entry):
"""Checkout contents from a svn repository"""
+ # pylint: disable=E1101
try:
client = pysvn.Client.update(entry.get('name'), recurse=True)
- except:
+ except pysvn.ClientError:
self.logger.error("Failed to update repository", exc_info=1)
return False
-
return True
+ # pylint: enable=E1101
def VerifyPath(self, entry, _):
vcs = entry.get('vcstype')
diff --git a/src/lib/Bcfg2/Client/Tools/YUMng.py b/src/lib/Bcfg2/Client/Tools/YUMng.py
index 34029b9fe..a93a48f9a 100644
--- a/src/lib/Bcfg2/Client/Tools/YUMng.py
+++ b/src/lib/Bcfg2/Client/Tools/YUMng.py
@@ -185,12 +185,14 @@ class YUMng(Bcfg2.Client.Tools.PkgTool):
else:
debuglevel = 0
+ # pylint: disable=E1121
try:
self.yb.preconf.debuglevel = debuglevel
self.yb._getConfig()
except AttributeError:
self.yb._getConfig(self.yb.conf.config_file_path,
debuglevel=debuglevel)
+ # pylint: enable=E1121
try:
self.yb.doConfigSetup()
@@ -711,7 +713,7 @@ class YUMng(Bcfg2.Client.Tools.PkgTool):
if result != 0:
self.logger.debug("Unable to install %s-%s" % \
(self.instance_status[inst].get('pkg').get('name'),
- self.str_evra(inst)))
+ nevraString(inst)))
return False
else:
self.logger.debug("Installed %s-%s-%s" % \
@@ -817,7 +819,7 @@ class YUMng(Bcfg2.Client.Tools.PkgTool):
for pkg in self.extra_instances:
for inst in pkg:
self.logger.info(" %s %s" % \
- ((pkg.get('name'), self.str_evra(inst))))
+ ((pkg.get('name'), nevraString(inst))))
# Figure out which instances of the packages actually need something
# doing to them and place in the appropriate work 'queue'.
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index b058ae16c..51d3ceecf 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -376,3 +376,6 @@ class SvcTool(Tool):
except:
self.logger.error("Unexpected failure of install method for entry type %s"
% (entry.tag), exc_info=1)
+
+ def InstallService(self, entry):
+ raise NotImplementedError
diff --git a/src/lib/Bcfg2/Client/XML.py b/src/lib/Bcfg2/Client/XML.py
index 858479611..d6bbd3b72 100644
--- a/src/lib/Bcfg2/Client/XML.py
+++ b/src/lib/Bcfg2/Client/XML.py
@@ -2,6 +2,8 @@
# library will use lxml, then builtin xml.etree, then ElementTree
+# pylint: disable=F0401,E0611
+
try:
from lxml.etree import Element, SubElement, XML, tostring
from lxml.etree import XMLSyntaxError as ParseError
@@ -19,7 +21,8 @@ except ImportError:
driver = 'etree-py'
except ImportError:
try:
- from elementtree.ElementTree import Element, SubElement, XML, tostring
+ from elementtree.ElementTree import Element, SubElement, XML, \
+ tostring
driver = 'etree'
import elementtree.ElementTree
Element = elementtree.ElementTree.Element
@@ -32,5 +35,3 @@ except ImportError:
print("Failed to load lxml, xml.etree and elementtree.ElementTree")
print("Cannot continue")
raise SystemExit(1)
-
-len([Element, SubElement, XML, tostring, ParseError])
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 16:28:13 +0000