X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=ec1cd36686f8b3f943723b430f9850a1a061e2ab;hb=731c2232d9964d0f441ff5ea386e5e9937aa77ab;hp=5bbd61a1492ae17db0ff36292ec51044e0feb43e;hpb=fb11aec0c46bae0797a4e32b1d19eb6fcbc07c49;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 5bbd61a1..ec1cd366 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -53,7 +53,8 @@ from collections import defaultdict ################################################################################ -default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties +#default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties +default_config = "/home/stew/etc/dak/dak.conf" #: default dak config, defines host properties default_apt_config = "/etc/dak/apt.conf" #: default apt config, not normally used alias_cache = None #: Cache for email alias checks @@ -528,7 +529,7 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"): raise NoFilesFieldError # Get SourceFormat object for this Format and validate it - format = get_format_from_string(changes.get['format']) + format = get_format_from_string(changes['format']) format.validate_format(is_a_dsc=is_a_dsc, field=field) includes_section = (not is_a_dsc) and field == "files" @@ -1504,8 +1505,8 @@ apt_pkg.init() Cnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(Cnf,default_config) -if which_conf_file() != default_config: - apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) +#if which_conf_file() != default_config: +# apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) ###############################################################################