summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin/Reports.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-06-06 18:27:24 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-06-06 18:27:24 -0500
commit05c0d709111ca27ca53b1a1b08735c9c081af6ac (patch)
tree90156f52fb50ee2c1d2868187ac520cf3e66ad07 /src/lib/Server/Admin/Reports.py
parent95797b788dc180b240e0c1c17f2559fbb4600b5b (diff)
parent8c497c815589c7c5878490df7661c6f5d3330829 (diff)
downloadbcfg2-05c0d709111ca27ca53b1a1b08735c9c081af6ac.tar.gz
bcfg2-05c0d709111ca27ca53b1a1b08735c9c081af6ac.tar.bz2
bcfg2-05c0d709111ca27ca53b1a1b08735c9c081af6ac.zip
Merge branch 'non-ascii-diffs' of https://github.com/weiss/bcfg2
Diffstat (limited to 'src/lib/Server/Admin/Reports.py')
-rw-r--r--src/lib/Server/Admin/Reports.py6
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,