From: Ansgar Burchardt Date: Mon, 17 Sep 2012 13:21:23 +0000 (+0200) Subject: daklib/utils.py: use daklib.config X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fdbd1d5f5bd0039b29be847192ddd2338b32019;p=dak daklib/utils.py: use daklib.config --- diff --git a/daklib/utils.py b/daklib/utils.py index fd50cb1c..ec929652 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -43,6 +43,7 @@ import email as modemail import subprocess import ldap +import daklib.config as config from dbconn import DBConn, get_architecture, get_component, get_suite, \ get_override_type, Keyring, session_wrapper, \ get_active_keyring_paths, get_primary_keyring_path, \ @@ -1550,14 +1551,7 @@ def get_changes_files(from_dir): ################################################################################ -apt_pkg.init() - -Cnf = apt_pkg.Configuration() -if not os.getenv("DAK_TEST"): - apt_pkg.read_config_file_isc(Cnf,default_config) - -if which_conf_file() != default_config: - apt_pkg.read_config_file_isc(Cnf,which_conf_file()) +Cnf = config.Config().Cnf ################################################################################