From 1040118a7e3b4bb99f20a2fd594f2792629e11a2 Mon Sep 17 00:00:00 2001 From: baigk Date: Wed, 20 Jan 2016 21:57:04 +0800 Subject: integrate yang2tosca to compass JITA: COMPASS-281 Change-Id: Ia2b4a7e915edc74dfb6359d1df513d23bec2731c Signed-off-by: baigk --- build/gen_ins_pkg_script.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'build/gen_ins_pkg_script.py') diff --git a/build/gen_ins_pkg_script.py b/build/gen_ins_pkg_script.py index ec04c511..5e3d1737 100644 --- a/build/gen_ins_pkg_script.py +++ b/build/gen_ins_pkg_script.py @@ -35,7 +35,8 @@ def get_packages_name_list(file_list, special_packages): for i in value: if i in special_packages: continue - package_name_list.append(i) + if i not in package_name_list: + package_name_list.append(i) return package_name_list @@ -56,9 +57,11 @@ def generate_download_script(root="", arch="", tmpl="", docker_tmpl="", default_ searchList = {'scripts':make_script} if os.path.exists(special_packages_dir): special_packages_names=[] - for i in os.listdir(special_packages_dir): - if os.path.isfile(os.path.join(special_packages_dir, i)): - special_packages_names.append(i) + + for parent, dirname, filenames in os.walk(special_packages_dir): + for filename in filenames: + if os.path.isfile(os.path.join(parent, filename)): + special_packages_names.append(filename) searchList.update({'spcial_packages':special_packages_names}) Dockerfile=os.path.basename(docker_tmpl).split('.')[0] -- cgit 1.2.3-korg