summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Encryption.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-08-09 16:45:45 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-08-09 16:45:45 -0400
commit0f7edd60e67d32438a8be42002faacde4e4a7649 (patch)
tree2b11b02f5bf4f9e7a6e609136bf2a19c8f166cc4 /src/lib/Bcfg2/Server/Encryption.py
parentcc11ada6b8871d7719fd0ea8a2ff382bba8a3bc2 (diff)
downloadbcfg2-0f7edd60e67d32438a8be42002faacde4e4a7649.tar.gz
bcfg2-0f7edd60e67d32438a8be42002faacde4e4a7649.tar.bz2
bcfg2-0f7edd60e67d32438a8be42002faacde4e4a7649.zip
testsuite: fixed most pylint complaints
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
-rwxr-xr-xsrc/lib/Bcfg2/Server/Encryption.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py
index 7e1294587..e64a6627f 100755
--- a/src/lib/Bcfg2/Server/Encryption.py
+++ b/src/lib/Bcfg2/Server/Encryption.py
@@ -32,6 +32,8 @@ IV = r'\0' * 16
class _OptionContainer(object):
+ """ Container for options loaded at import-time to configure
+ encryption """
options = [
Bcfg2.Options.BooleanOption(
cf=("encryption", "lax_decryption"),
@@ -371,7 +373,7 @@ class PropertiesCryptoMixin(object):
if pname:
self.logger.warning("Passphrase %s not found in %s, "
"using passphrase given on command line" %
- (pname, Bcfg2.Option.setup.configfile))
+ (pname, Bcfg2.Options.setup.configfile))
passphrase = self.passphrase
pname = self.pname
else:
@@ -502,6 +504,7 @@ class CLI(object):
return False
def run(self): # pylint: disable=R0912,R0915
+ """ Run bcfg2-crypt """
for fname in Bcfg2.Options.setup.files:
if not os.path.exists(fname):
self.logger.error("%s does not exist, skipping" % fname)