diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-04 06:57:50 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-04 06:57:55 -0600 |
| commit | f35c38e87eafffb497338b9273fe84f284a41dcf (patch) | |
| tree | f919f37b971b0d32dd098efba945a20c14a3a0df /src/lib/Bcfg2/Server/Plugins/FileProbes.py | |
| parent | d052c66c5d5e561f2b5de4ebebd60dba7b78b1cc (diff) | |
| download | bcfg2-f35c38e87eafffb497338b9273fe84f284a41dcf.tar.gz bcfg2-f35c38e87eafffb497338b9273fe84f284a41dcf.tar.bz2 bcfg2-f35c38e87eafffb497338b9273fe84f284a41dcf.zip | |
fixed conversion to octal in py3k
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: |