summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-03 19:50:53 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-03 19:51:05 -0600
commit89ddbdac554c806147805c47d5b3ceabaa6739f0 (patch)
tree8a7a833af7083122a5259306bcbf089b39e3e0ae /src/lib/Bcfg2/Client
parentd4f4167889ea5a293ba85b4e4f6ae477ecf3487b (diff)
downloadbcfg2-89ddbdac554c806147805c47d5b3ceabaa6739f0.tar.gz
bcfg2-89ddbdac554c806147805c47d5b3ceabaa6739f0.tar.bz2
bcfg2-89ddbdac554c806147805c47d5b3ceabaa6739f0.zip
fixed SELinux tool/plugin tests
Diffstat (limited to 'src/lib/Bcfg2/Client')
-rw-r--r--src/lib/Bcfg2/Client/Tools/SELinux.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 7aa0e8a20..6bd728114 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -93,8 +93,12 @@ class SELinux(Bcfg2.Client.Tools.Tool):
return self.GenericSEVerify
elif attr.startswith("InstallSE"):
return self.GenericSEInstall
- else:
- return object.__getattr__(self, attr)
+ # there's no need for an else here, because python checks for
+ # an attribute in the "normal" ways first. i.e., if self.txn
+ # is used, __getattr__() is never called because txn exists as
+ # a "normal" attribute of this object. See
+ # http://docs.python.org/2/reference/datamodel.html#object.__getattr__
+ # for details
def BundleUpdated(self, _, states):
for handler in self.handlers.values():