diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-06 18:27:24 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-06 18:27:24 -0500 |
| commit | 05c0d709111ca27ca53b1a1b08735c9c081af6ac (patch) | |
| tree | 90156f52fb50ee2c1d2868187ac520cf3e66ad07 /src/lib/Server/Admin/__init__.py | |
| parent | 95797b788dc180b240e0c1c17f2559fbb4600b5b (diff) | |
| parent | 8c497c815589c7c5878490df7661c6f5d3330829 (diff) | |
| download | bcfg2-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/__init__.py')
| -rw-r--r-- | src/lib/Server/Admin/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py index 8915492a3..b34d7108c 100644 --- a/src/lib/Server/Admin/__init__.py +++ b/src/lib/Server/Admin/__init__.py @@ -113,7 +113,8 @@ class MetadataCore(Mode): def __init__(self, configfile, usage, pwhitelist=None, pblacklist=None): Mode.__init__(self, configfile) options = {'plugins': Bcfg2.Options.SERVER_PLUGINS, - 'configfile': Bcfg2.Options.CFILE} + 'configfile': Bcfg2.Options.CFILE, + 'encoding': Bcfg2.Options.ENCODING} setup = Bcfg2.Options.OptionParser(options) setup.hm = usage setup.parse(sys.argv[1:]) @@ -126,7 +127,7 @@ class MetadataCore(Mode): try: self.bcore = Bcfg2.Server.Core.Core(self.get_repo_path(), setup['plugins'], - 'foo', 'UTF-8') + 'foo', setup['encoding']) except Bcfg2.Server.Core.CoreInitError: msg = sys.exc_info()[1] self.errExit("Core load failed because %s" % msg) |