diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-12-04 08:14:33 -0500 |
| commit | 09a45d745269a419b0c5da0664912e061dc8e5d3 (patch) | |
| tree | c5c0af33093087f10f0caf5ce021aa4cb0b4a879 /src/lib/Bcfg2/Server/Plugins/FileProbes.py | |
| parent | 648c8f6e313e684d5fadc1fdbc97e08d83eb2b16 (diff) | |
| parent | f35c38e87eafffb497338b9273fe84f284a41dcf (diff) | |
| download | bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.gz bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.tar.bz2 bcfg2-09a45d745269a419b0c5da0664912e061dc8e5d3.zip | |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/FileProbes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/FileProbes.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py index 8bd1d3504..5ec0d7280 100644 --- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py +++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py @@ -24,7 +24,7 @@ import sys import pwd import grp import Bcfg2.Client.XML -from Bcfg2.Compat import b64encode +from Bcfg2.Compat import b64encode, oct_mode path = "%s" @@ -41,7 +41,7 @@ data = Bcfg2.Client.XML.Element("ProbedFileData", name=path, owner=pwd.getpwuid(stat[4])[0], group=grp.getgrgid(stat[5])[0], - mode=oct(stat[0] & 4095)) + mode=oct_mode(stat[0] & 4095)) try: data.text = b64encode(open(path).read()) except: @@ -101,7 +101,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, for data in datalist: if data.text is None: - self.logger.error("Got null response to %s file probe from %s" + self.logger.error("Got null response to %s file probe from %s" % (data.get('name'), metadata.hostname)) else: try: |