diff options
| author |   baigk <baiguoku@huawei.com> | 2016-01-20 21:57:04 +0800 |
|---|---|---|
| committer | baigk <baiguoku@huawei.com> | 2016-01-25 07:34:18 +0000 |
| commit | 1040118a7e3b4bb99f20a2fd594f2792629e11a2 (patch) | |
| tree | 9aa671304b957f6a5f690d958eda52b2e1a976f7 /build/gen_ins_pkg_script.py | |
| parent | 6c1adf0e4c442d1a97bb1d4ee5043937e6e596c8 (diff) | |
integrate yang2tosca to compass
JITA: COMPASS-281
Change-Id: Ia2b4a7e915edc74dfb6359d1df513d23bec2731c
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'build/gen_ins_pkg_script.py')
| -rw-r--r-- | build/gen_ins_pkg_script.py | 11 |
1 files changed, 7 insertions, 4 deletions
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] |