--- a/bin/update Fri Mar 23 15:15:22 2012 +0200
+++ b/bin/update Sat Mar 24 10:38:57 2012 +0200
@@ -47,9 +47,9 @@
# Hide files under repo in commit diff output..
REPO_HIDE='*.serial'
-# XXX: hosts data input charset?
-PROCESS_ARGS='--input-charset latin-1'
-DHCP_FILE_ARGS='--input-charset latin-1'
+# data input charsets; arguments to ./bin/... python scripts
+HOSTS_FILE_ARGS='--input-charset utf-8'
+DHCP_FILE_ARGS='--input-charset utf-8'
# External bins
NAMED_CHECKZONE=/usr/sbin/named-checkzone
--- a/lib/update.operations Fri Mar 23 15:15:22 2012 +0200
+++ b/lib/update.operations Sat Mar 24 10:38:57 2012 +0200
@@ -81,7 +81,7 @@
log_update "Generating hosts $zone <- $base..."
do_update $zone \
- $BIN/process-zone $PROCESS_ARGS $ROOT/$base "$@"
+ $BIN/process-zone $HOSTS_FILE_ARGS $ROOT/$base "$@"
else
log_skip "Generating hosts $zone <- $base: not changed"
fi
@@ -244,7 +244,7 @@
function check_hosts {
local hosts=$1; shift 1
- local cmd=($BIN/process-zone $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@")
+ local cmd=($BIN/process-zone $HOSTS_FILE_ARGS $ROOT/$hosts --check-hosts "$@")
if "${cmd[@]}" -q; then
log_skip "Check $hosts: OK"