diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-08-01 14:22:32 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-08-01 14:22:32 +0000 |
| commit | 867b093e26069de43268e424dc673d1242f6380d (patch) | |
| tree | a34227e283b174485738151dc543324286597b9f /src/lib/Client | |
| parent | 27f130ee295c6469c74d172fe08ac310046c5d2c (diff) | |
| download | bcfg2-867b093e26069de43268e424dc673d1242f6380d.tar.gz bcfg2-867b093e26069de43268e424dc673d1242f6380d.tar.bz2 bcfg2-867b093e26069de43268e424dc673d1242f6380d.zip | |
Fix binary config file stats upload
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3589 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client')
| -rw-r--r-- | src/lib/Client/Tools/POSIX.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index f4e3063a6..a98ae24fd 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -5,7 +5,7 @@ from stat import S_ISVTX, S_ISGID, S_ISUID, S_IXUSR, S_IWUSR, S_IRUSR, S_IXGRP from stat import S_IWGRP, S_IRGRP, S_IXOTH, S_IWOTH, S_IROTH, ST_MODE, S_ISDIR from stat import S_IFREG, ST_UID, ST_GID, S_ISREG, S_IFDIR, S_ISLNK, ST_MTIME -import binascii, difflib, grp, os, pwd, xml.sax.saxutils +import binascii, difflib, grp, os, pwd, string import Bcfg2.Client.Tools def calcPerms(initial, perms): @@ -268,7 +268,6 @@ class POSIX(Bcfg2.Client.Tools.Tool): entry.set('current_bfile', binascii.b2a_base64(content)) nqtext = entry.get('qtext', '') nqtext += '\nBinary file, no printable diff' - entry.set('qtext', nqtest) else: diff = '\n'.join([x for x in difflib.ndiff(content.split('\n'), tempdata.split('\n'))]) @@ -284,7 +283,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): if nqtext: nqtext += '\n' nqtext += eudiff - entry.set('qtext', nqtext) + entry.set('qtext', nqtext) qtxt = entry.get('qtext', '') qtxt += "\nInstall ConfigFile %s: (y/N): " % (entry.get('name')) entry.set('qtext', qtxt) |