diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2011-06-22 17:01:40 -0500 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2011-06-22 17:01:40 -0500 |
| commit | 4849378a62ab0dbf72f8ce4e6b2073dc73f2337a (patch) | |
| tree | 14945dd6045c438f5dbc8e96f023258d31e1adf9 /src/lib/Server/Admin/Reports.py | |
| parent | 8d08d5195fa0b6f503752273183948e5d24f33d6 (diff) | |
| parent | 2db056574f5f55c3c802da63abe7e3de10db5d76 (diff) | |
| download | bcfg2-4849378a62ab0dbf72f8ce4e6b2073dc73f2337a.tar.gz bcfg2-4849378a62ab0dbf72f8ce4e6b2073dc73f2337a.tar.bz2 bcfg2-4849378a62ab0dbf72f8ce4e6b2073dc73f2337a.zip | |
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'src/lib/Server/Admin/Reports.py')
| -rw-r--r-- | src/lib/Server/Admin/Reports.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py index 942477a49..c9f3d3f58 100644 --- a/src/lib/Server/Admin/Reports.py +++ b/src/lib/Server/Admin/Reports.py @@ -257,6 +257,11 @@ class Reports(Bcfg2.Server.Admin.Mode): except (IOError, XMLSyntaxError): self.errExit("StatReports: Failed to parse %s" % (stats_file)) + try: + encoding = self.cfp.get('components', 'encoding') + except: + encoding = 'UTF-8' + if not clientspath: try: clientspath = "%s/Metadata/clients.xml" % \ @@ -271,6 +276,7 @@ class Reports(Bcfg2.Server.Admin.Mode): try: load_stats(clientsdata, statsdata, + encoding, verb, self.log, quick=quick, |