diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2017-08-18 15:01:32 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2017-08-18 15:01:32 -0500 |
| commit | e193079d1779e4d66d80882e6f1c3ff9ba05619b (patch) | |
| tree | b47f262f3b7d57a1ddeefd0f2aeba3bb35539d18 /src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py | |
| parent | cd0f5f5f62376f7dc64e5c5c7d59a7c6bfcb918f (diff) | |
| parent | 0fdabbcb4668d5f70f76c08a6e3216c5542e7457 (diff) | |
| download | bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.gz bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.bz2 bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.zip | |
Merge branch 'feature/travis-container' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py b/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py index f4f1ee4bf..bcd695058 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/Augeas.py @@ -5,6 +5,7 @@ import Bcfg2.Client.XML from augeas import Augeas from Bcfg2.Client.Tools.POSIX.base import POSIXTool from Bcfg2.Client.Tools.POSIX.File import POSIXFile +from Bcfg2.Compat import all # pylint: disable=W0622 class AugeasCommand(object): @@ -249,8 +250,8 @@ class POSIXAugeas(POSIXTool): for cmd in self.get_commands(entry): try: if not cmd.verify(): - err = "Augeas: Command has not been applied to %s: %s" % \ - (entry.get("name"), cmd) + err = ("Augeas: Command has not been applied to %s: %s" % + (entry.get("name"), cmd)) self.logger.debug(err) entry.set('qtext', "\n".join([entry.get('qtext', ''), err])) @@ -259,8 +260,8 @@ class POSIXAugeas(POSIXTool): else: cmd.command.set("verified", "true") except: # pylint: disable=W0702 - err = "Augeas: Unexpected error verifying %s: %s: %s" % \ - (entry.get("name"), cmd, sys.exc_info()[1]) + err = ("Augeas: Unexpected error verifying %s: %s: %s" % + (entry.get("name"), cmd, sys.exc_info()[1])) self.logger.error(err) entry.set('qtext', "\n".join([entry.get('qtext', ''), err])) rv = False |