From c98e840e6f67e2971ffc26a698d76c09a919db91 Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Wed, 20 Feb 2008 11:34:47 -0800 Subject: [PATCH] Fixed some packaging issues with config file handling. --- apt-dht.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-dht.py b/apt-dht.py index b096d38..1d9933b 100644 --- a/apt-dht.py +++ b/apt-dht.py @@ -19,7 +19,7 @@ from twisted.web2 import channel from apt_dht.apt_dht_conf import config, version, DEFAULT_CONFIG_FILES from apt_dht.interfaces import IDHT -config_file = [] +config_file = '' if __name__ == '__main__': # Parse command line parameters when started on command line @@ -28,7 +28,7 @@ if __name__ == '__main__': ['help', 'h', 'Print this help message'], ] optParameters = [ - ['config-file', 'c', [], "Configuration file"], + ['config-file', 'c', '', "Configuration file"], ['log-file', 'l', '-', "File to log to, - for stdout"], ] longdesc="apt-dht is a peer-to-peer downloader for apt users" @@ -51,7 +51,9 @@ if __name__ == '__main__': f = open(log_file, 'w') log.startLogging(f, setStdout=1) -config.read(DEFAULT_CONFIG_FILES + [config_file]) +log.msg("Loading config files: '%s'" % "', '".join(DEFAULT_CONFIG_FILES + [config_file])) +config_read = config.read(DEFAULT_CONFIG_FILES + [config_file]) +log.msg("Successfully loaded config files: '%s'" % "', '".join(config_read)) if config.has_option('DEFAULT', 'username') and config.get('DEFAULT', 'username'): uid,gid = pwd.getpwnam(config.get('DEFAULT', 'username'))[2:4] else: -- 2.39.5