diff options
Diffstat (limited to 'poky/scripts/lib/wic/engine.py')
| -rw-r--r-- | poky/scripts/lib/wic/engine.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/poky/scripts/lib/wic/engine.py b/poky/scripts/lib/wic/engine.py index 61939ad194..42e93c3eb8 100644 --- a/poky/scripts/lib/wic/engine.py +++ b/poky/scripts/lib/wic/engine.py @@ -75,8 +75,7 @@ def find_canned_image(scripts_path, wks_file): for fname in files: if fname.endswith("~") or fname.endswith("#"): continue - if ((fname.endswith(".wks") and wks_file + ".wks" == fname) or \ - (fname.endswith(".wks.in") and wks_file + ".wks.in" == fname)): + if fname.endswith(".wks") and wks_file + ".wks" == fname: fullpath = os.path.join(canned_wks_dir, fname) return fullpath return None @@ -93,7 +92,7 @@ def list_canned_images(scripts_path): for fname in files: if fname.endswith("~") or fname.endswith("#"): continue - if fname.endswith(".wks") or fname.endswith(".wks.in"): + if fname.endswith(".wks"): fullpath = os.path.join(canned_wks_dir, fname) with open(fullpath) as wks: for line in wks: @@ -102,7 +101,7 @@ def list_canned_images(scripts_path): if idx != -1: desc = line[idx + len("short-description:"):].strip() break - basename = fname.split('.')[0] + basename = os.path.splitext(fname)[0] print(" %s\t\t%s" % (basename.ljust(30), desc)) |