diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-07-16 00:37:54 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-07-16 00:37:54 +0000 |
| commit | ff9e00c47ce25436867a6d583952aa35d9ec26a2 (patch) | |
| tree | 93c09f169d4fe4fb344c6df4e28c7b8202e04f53 /src | |
| parent | 25bb2fc4a40eafcb6f04e51c3152702ca7ff8987 (diff) | |
| download | bcfg2-ff9e00c47ce25436867a6d583952aa35d9ec26a2.tar.gz bcfg2-ff9e00c47ce25436867a6d583952aa35d9ec26a2.tar.bz2 bcfg2-ff9e00c47ce25436867a6d583952aa35d9ec26a2.zip | |
fix base64 problem
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3453 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Client/Frame.py | 2 | ||||
| -rwxr-xr-x | src/lib/Server/Reports/importscript.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index a2682d023..ecd4917a3 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -328,7 +328,7 @@ class Frame: container.append(item) if item.get('current_diff', False): item.set('current_bdiff', - binascii.a2b_base64(item.get('current_diff'))) + binascii.b2a_base64(item.get('current_diff'))) item.set('current_diff', '') timeinfo = Bcfg2.Client.XML.Element("OpStamps") diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py index be7f59da6..23d233379 100755 --- a/src/lib/Server/Reports/importscript.py +++ b/src/lib/Server/Reports/importscript.py @@ -147,7 +147,7 @@ if __name__ == '__main__': for r in statsdata.findall('.//Bad/*')+statsdata.findall('.//Extra/*')+statsdata.findall('.//Modified/*'): if r.get('current_bdiff', False): - rc_diff = binascii.b2a_base64(r.get('current_bdiff')) + rc_diff = binascii.a2b_base64(r.get('current_bdiff')) else: rc_diff = r.get('current_diff', '') arguments = [r.get('owner', default=""), r.get('current_owner', default=""), @@ -204,7 +204,7 @@ if __name__ == '__main__': ('Modified/*', modified_hash, 'reports_modified')]: for x in statistics.findall(xpath): if x.get('current_bdiff', False): - xc_diff = binascii.b2a_base64(x.get('current_bdiff')) + xc_diff = binascii.a2b_base64(x.get('current_bdiff')) else: xc_diff = x.get('current_diff', '') |