diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-05-31 12:23:46 +0100 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-05-31 12:23:46 +0100 |
| commit | 44b6b8ff8b20244d07c6ac96ed306fe03cfa2cb1 (patch) | |
| tree | 3f317ea8ab47a0e68c331091fa110f3a4283c57c /kswriter | |
| parent | 8f2e4e8d216661c71971c4ec5e26b8862204055e (diff) | |
| parent | bee3402b7fcdf43b90a1a269a7616a47a796672c (diff) | |
| download | kickstarter-44b6b8ff8b20244d07c6ac96ed306fe03cfa2cb1.tar.gz kickstarter-44b6b8ff8b20244d07c6ac96ed306fe03cfa2cb1.tar.bz2 kickstarter-44b6b8ff8b20244d07c6ac96ed306fe03cfa2cb1.zip | |
resolved conflict
Diffstat (limited to 'kswriter')
| -rw-r--r-- | kswriter/KSWriter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kswriter/KSWriter.py b/kswriter/KSWriter.py index 54d2021..eaee98d 100644 --- a/kswriter/KSWriter.py +++ b/kswriter/KSWriter.py @@ -20,7 +20,7 @@ class KSWriter(): def __init__(self, configs=None, repos=None, outdir=".", config=None, packages=False): self.dist = None self.arch = None - self.image_filename = configs + self.image_filename = os.path.abspath(os.path.expanduser(configs)) self.repo_filename = repos self.outdir = outdir self.packages = packages @@ -141,7 +141,7 @@ class KSWriter(): print "%s is inactive, not generating %s at this time" %(img['Name'], img['FileName'] ) for path in self.image_meta['ExternalConfigs']: external_config_dir = os.path.join(os.path.dirname(self.image_filename), path) - + for f in os.listdir(external_config_dir): if f.endswith('.yaml'): fp = file('%s/%s' %(external_config_dir, f), 'r') |