diff options
| -rw-r--r-- | src/lib/Client/Tools/POSIX.py | 8 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Statistics.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index f16b714ff..6aa0b76f8 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -148,7 +148,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): entry.set('perms', str(oct(ondisk[ST_MODE])[-4:])) try: content = open(entry.get('name')).read() - if (entry.get('sensitive') not in ['true', 'True']): + if entry.get('sensitive') not in ['true', 'True']: entry.set('current_bfile', binascii.b2a_base64(content)) except IOError: error = sys.exc_info()[1] @@ -483,7 +483,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): contentStatus = content == tempdata if not contentStatus: if tbin or not isString(content, self.setup['encoding']): - if (entry.get('sensitive') not in ['true', 'True']): + if entry.get('sensitive') not in ['true', 'True']: entry.set('current_bfile', binascii.b2a_base64(content)) nqtext = entry.get('qtext', '') nqtext += '\nBinary file, no printable diff' @@ -506,7 +506,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): do_diff = False break if do_diff: - if (entry.get('sensitive') not in ['true', 'True']): + if entry.get('sensitive') not in ['true', 'True']: diff = '\n'.join(rawdiff) entry.set("current_bdiff", binascii.b2a_base64(diff)) # entry.set("current_diff", diff) @@ -524,7 +524,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): nqtext += '\n' nqtext += dudiff else: - if (entry.get('sensitive') not in ['true', 'True']): + if entry.get('sensitive') not in ['true', 'True']: entry.set('current_bfile', binascii.b2a_base64(content)) nqtext = entry.get('qtext', '') nqtext += '\nDiff took too long to compute, no printable diff' diff --git a/src/lib/Server/Plugins/Statistics.py b/src/lib/Server/Plugins/Statistics.py index f4f4c7175..7251ab1b5 100644 --- a/src/lib/Server/Plugins/Statistics.py +++ b/src/lib/Server/Plugins/Statistics.py @@ -150,7 +150,9 @@ class Statistics(Bcfg2.Server.Plugin.Plugin, owner = cfentry.get('current_owner', cfentry.get('owner')) group = cfentry.get('current_group', cfentry.get('group')) perms = cfentry.get('current_perms', cfentry.get('perms')) - if 'current_bfile' in cfentry.attrib: + if cfentry.get('sensitive') in ['true', 'True']: + raise Bcfg2.Server.Plugin.PluginExecutionError + elif 'current_bfile' in cfentry.attrib: contents = binascii.a2b_base64(cfentry.get('current_bfile')) elif 'current_bdiff' in cfentry.attrib: diff = binascii.a2b_base64(cfentry.get('current_bdiff')) |