diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 15:29:48 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 15:29:48 -0500 |
| commit | 5b5427a214f7e4c11a22ea6a0d319c40b06662c1 (patch) | |
| tree | ea17ecbdf858a28520e9e86ece2ef68483be64ab /src/lib/Server/Plugins/Metadata.py | |
| parent | dd6fba39f81648936b987da73599de8b6c2c241c (diff) | |
| parent | b1ab3e2bab9f07c13daf5dcfd4a9502eb84dcf0d (diff) | |
| download | bcfg2-5b5427a214f7e4c11a22ea6a0d319c40b06662c1.tar.gz bcfg2-5b5427a214f7e4c11a22ea6a0d319c40b06662c1.tar.bz2 bcfg2-5b5427a214f7e4c11a22ea6a0d319c40b06662c1.zip | |
Merge branch 'py3k'
Conflicts:
src/lib/Server/Plugins/SSHbase.py
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server/Plugins/Metadata.py')
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index ca6e43851..6570f2912 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -766,7 +766,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, (address[0])) return False # populate the session cache - if user != 'root': + if user.decode('utf-8') != 'root': self.session_cache[address] = (time.time(), client) return True |