Get full path to basecfg much earlier

Move the path expansion for the kernel configuration file to the load_config() function. Signed-off-by: Major Hayden <[email protected]>
cki-project · May 14, 2018 · 31d36f8 · 31d36f8
1 parent a7009aa
commit 31d36f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -711,6 +711,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