diff options
author | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
---|---|---|
committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
commit | b848b5303c21c2dcb3d3c52e260944676864e332 (patch) | |
tree | d1969c51a20a227b42ffb4c077ba1df79d784240 /src/lib/Server/Plugins/Metadata.py | |
parent | 9d0c43a54e4172061af2779336b821bb93fefc71 (diff) | |
parent | 1186eae0c62ba6810ea597083bd8e56d487811c0 (diff) | |
download | bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2 bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip |
Merge branch 'master' into yumng
Conflicts:
src/lib/Client/Tools/YUMng.py
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 |