1. photon
  2. Commit 3617618a313c0cefbe3ac332afcdd7c107628ef9
Browse code

PackageSelector: Get rid of the 'remove' option temporarily

The recent changes related to multi-versioning broke the
PackageSelector code that deals with replacing certain packages with
other alternatives (eg: replacing linux with linux-aws for AMIs). This
feature will be reimplemented in a different way shortly; so in
preparation, get rid of the 'remove' option.

Change-Id: Ibb51fcf52f775655d946c9b798b809772dbd380c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5961
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

Srivatsa S. Bhat (VMware) authored on 2018/10/24 04:19:32
Showing 2 changed files
common/data/build_install_options_ami.json
History View file @ 3617618
... ... 
@@ -9,7 +9,6 @@
9 9 
         "title" : "Photon AMI packages",
10 10 
         "file" : "packages_ami.json",
11 11 
         "visible" : false,
12 
-        "include" : ["minimal"],
13 
-        "remove" : ["linux"]
12 
+        "include" : ["minimal"]
14 13 
     }
15 14 
 }
installer/packageselector.py
History View file @ 3617618
... ... 
@@ -42,11 +42,6 @@ class PackageSelector(object):
42 42 
                                                                      install_option[1]["file"]))
43 43 
                 package_list_json = json_wrapper_package_list.read()
44 44 
                 package_list = package_list + package_list_json["packages"]
45 
-
46 
-                if "remove" in install_option[1]:
47 
-                    for package in install_option[1]["remove"]:
48 
-                        package_list.remove(package)
49 
-
50 45 
                 break
51 46 
         return package_list
52 47