aboutsummaryrefslogtreecommitdiffstats
path: root/build/gen_ins_pkg_script.py
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2016-01-01 00:35:12 +0800
committerbaigk <baiguoku@huawei.com>2016-01-04 21:24:04 +0800
commitbef20d54c7a1c7068534c0dedf4ca8759a74745d (patch)
tree6c919385867cf56d6096a22618fa974e282ede30 /build/gen_ins_pkg_script.py
parent617877977bb49b9a97f24b0fee583d104ef68891 (diff)
xintegrate special keepalived package
JITA: COMPASS-234 Change-Id: I830bed488d5fd6e44ddada63a77c591be9581e45 Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'build/gen_ins_pkg_script.py')
-rw-r--r--build/gen_ins_pkg_script.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/build/gen_ins_pkg_script.py b/build/gen_ins_pkg_script.py
index c3c55cfc..132df25f 100644
--- a/build/gen_ins_pkg_script.py
+++ b/build/gen_ins_pkg_script.py
@@ -20,19 +20,25 @@ def get_packages_name_list(file_list, special_packages):
for file in file_list:
datas = yaml.load(open(file))
for key, value in datas.items():
+ if key == "pip_packages":
+ continue
+
if not key.endswith("packages") and not key.endswith("packages_noarch"):
continue
if not value:
continue
- if value in special_packages:
- continue
+ if not isinstance(value, list):
+ value = [value]
+
+ for i in value:
+ if i in special_packages:
+ continue
- if value not in package_name_list:
- package_name_list += value
+ package_name_list.append(value)
- return package_name_list
+ return list(set(package_name_list)
def generate_download_script(root="", arch="", tmpl="", docker_tmpl="", default_packages="",
special_packages="", special_packages_script_dir="", special_packages_dir=""):