summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-09 16:00:43 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-09 16:00:43 -0400
commitece78e71a84c19da694d0122be2e6d78d08d8e8d (patch)
tree3008718e6ad81dee51dc04d501670ee247c2108f /src/lib/Bcfg2/Client/Tools/POSIXUsers.py
parent6b662945b58eafd8e27f0191f4d7a78e7cc4ad05 (diff)
parent8fd0dad3e99f4452a6cd3f27e5c97efd9fc308e7 (diff)
downloadbcfg2-ece78e71a84c19da694d0122be2e6d78d08d8e8d.tar.gz
bcfg2-ece78e71a84c19da694d0122be2e6d78d08d8e8d.tar.bz2
bcfg2-ece78e71a84c19da694d0122be2e6d78d08d8e8d.zip
Merge branch 'maint'
Conflicts: src/lib/Bcfg2/Server/Plugins/Cfg/CfgAuthorizedKeysGenerator.py src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/POSIXUsers.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIXUsers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index aeafc3817..58a3bbdfc 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -3,6 +3,7 @@ and groupadd/mod/del """
import pwd
import grp
+import Bcfg2.Options
import Bcfg2.Client.XML
import Bcfg2.Client.Tools
from Bcfg2.Utils import PackedDigitRange
@@ -202,7 +203,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
else:
for attr, idx in self.attr_mapping[entry.tag].items():
val = str(self.existing[entry.tag][entry.get("name")][idx])
- entry.set("current_%s" % attr, val)
+ entry.set("current_%s" %
+ attr, val.decode(Bcfg2.Options.setup.encoding))
if attr in ["uid", "gid"]:
if entry.get(attr) is None:
# no uid/gid specified, so we let the tool