diff --git a/skt/__init__.py b/skt/__init__.py index 6aff5d3f..40c6c6f5 100644 --- a/skt/__init__.py +++ b/skt/__init__.py @@ -433,9 +433,7 @@ class kbuilder(object): def __init__(self, path, basecfg, cfgtype=None, makeopts=None, enable_debuginfo=False): self.path = path - # FIXME Move expansion up the call stack, as this limits the class - # usefulness, because tilde is a valid path character. - self.basecfg = os.path.expanduser(basecfg) + self.basecfg = basecfg self.cfgtype = cfgtype if cfgtype is not None else "olddefconfig" self._ready = 0 self.makeopts = None diff --git a/skt/executable.py b/skt/executable.py index f63cfd5a..0e3b3777 100644 --- a/skt/executable.py +++ b/skt/executable.py @@ -714,6 +714,8 @@ def load_config(args): # Get absolute paths for files and directories if cfg.get('workdir'): cfg['workdir'] = full_path(cfg.get('workdir')) + if cfg.get('basecfg'): + cfg['basecfg'] = full_path(cfg.get('basecfg')) return cfg