diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-06 18:30:46 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-06 18:34:32 -0500 |
commit | 3fdaa9f7baf648ed6e4fa70e892605147cf9252e (patch) | |
tree | 8f59c070ea29fd03bba83c791148d50228399078 | |
parent | 05c0d709111ca27ca53b1a1b08735c9c081af6ac (diff) | |
download | bcfg2-3fdaa9f7baf648ed6e4fa70e892605147cf9252e.tar.gz bcfg2-3fdaa9f7baf648ed6e4fa70e892605147cf9252e.tar.bz2 bcfg2-3fdaa9f7baf648ed6e4fa70e892605147cf9252e.zip |
Options: Set default encoding to UTF-8 (as per Holger Weiß's suggestion)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r-- | man/bcfg2.conf.5 | 4 | ||||
-rw-r--r-- | src/lib/Options.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index 44d8beb50..786f69f9a 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -410,9 +410,7 @@ eg: bcfg2 = https://10.3.1.6:6789 .TP .B encoding -Text encoding of configuration files. Defaults to the system default -encoding. - +Text encoding of configuration files. Defaults to UTF-8. .SH LOGGING OPTIONS Specified in the [logging] section. These options control the server diff --git a/src/lib/Options.py b/src/lib/Options.py index 5c0829df7..0d978c519 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -203,8 +203,10 @@ SENDMAIL_PATH = Option('Path to sendmail', cf=('reports', 'sendmailpath'), default='/usr/lib/sendmail') INTERACTIVE = Option('Prompt the user for each change', default=False, cmd='-I', ) -ENCODING = Option('Encoding of cfg files', default=sys.getdefaultencoding(), - cmd='-E', odesc='<encoding>', +ENCODING = Option('Encoding of cfg files', + default='UTF-8', + cmd='-E', + odesc='<encoding>', cf=('components', 'encoding')) PARANOID_PATH = Option('Specify path for paranoid file backups', default='/var/cache/bcfg2', cf=('paranoid', 'path'), |