1. photon
  2. Commit 05640f92d6ea717aa1f6595be5e3123be351d42c
Browse code

Remove type field from build_install json files

Anish Swaminathan authored on 2015/07/11 07:06:52
Showing 5 changed files
common/data/build_install_options_all.json
History View file @ 05640f9
... ... 
@@ -1,40 +1,35 @@
1 1 
 {
2 
-    "iso_packages" : {
2 
+    "iso" : {
3 3 
         "order" : 0,
4 
-        "type" : "iso",
5 4 
         "title" : "ISO Packages",
6 5 
         "file" : "packages_iso.json",
7 6 
         "visible" : false,
8 7 
         "include" : "none"
9 8 
     },
10 
-    "micro_packages" : {
9 
+    "micro" : {
11 10 
         "order" : 1,
12 
-        "type" : "micro",
13 11 
         "title" : "1. Photon Micro",
14 12 
         "file" : "packages_micro.json",
15 13 
         "visible" : true,
16 14 
         "include" : "none"
17 15
18 16 
     },
19 
-    "minimal_packages" : {
17 
+    "minimal" : {
20 18 
         "order" : 2,
21 
-        "type" : "minimal",
22 19 
         "title" : "2. Photon Minimal",
23 20 
         "file" : "packages_minimal.json",
24 21 
         "visible" : true,
25 22 
         "include" : "none"
26 23 
     },
27 
-    "full_packages" : {
24 
+    "full" : {
28 25 
         "order" : 3,
29 
-        "type" : "full",
30 26 
         "title" : "3. Photon Full",
31 27 
         "file" : "packages_full.json",
32 28 
         "visible" : true,
33 29 
         "include" : "minimal"
34 30 
     },
35 
-    "extra_packages" : {
31 
+    "extra" : {
36 32 
         "order" : 4,
37 
-        "type" : "extra",
38 33 
         "title" : "Extra packages not installed.",
39 34 
         "file" : "packages_extra.json",
40 35 
         "visible" : false,
common/data/build_install_options_micro.json
History View file @ 05640f9
... ... 
@@ -1,15 +1,13 @@
1 1 
 {
2 
-    "iso_packages" : {
2 
+    "iso" : {
3 3 
         "order" : 0,
4 
-        "type" : "iso",
5 4 
         "title" : "ISO Packages",
6 5 
         "file" : "packages_iso.json",
7 6 
         "visible" : false,
8 7 
         "include" : "none"
9 8 
     },
10 
-    "micro_packages" : {
9 
+    "micro" : {
11 10 
         "order" : 1,
12 
-        "type" : "micro",
13 11 
         "title" : "Photon Micro",
14 12 
         "file" : "packages_micro.json",
15 13 
         "visible" : true,
common/data/build_install_options_minimal.json
History View file @ 05640f9
... ... 
@@ -1,15 +1,13 @@
1 1 
 {
2 
-    "iso_packages" : {
2 
+    "iso" : {
3 3 
         "order" : 0,
4 
-        "type" : "iso",
5 4 
         "title" : "ISO Packages",
6 5 
         "file" : "packages_iso.json",
7 6 
         "visible" : false,
8 7 
         "include" : "none"
9 8 
     },
10 
-    "minimal_packages" : {
9 
+    "minimal" : {
11 10 
         "order" : 1,
12 
-        "type" : "minimal",
13 11 
         "title" : "Photon Minimal",
14 12 
         "file" : "packages_minimal.json",
15 13 
         "visible" : true,
installer/packageselector.py
History View file @ 05640f9
... ... 
@@ -33,7 +33,7 @@ class PackageSelector(object):
33 33 
     def get_packages_to_install(self, options, base_path, config_type):
34 34 
         package_list = []
35 35 
         for install_option in options:
36 
-            if install_option[1]["type"] == config_type:
36 
+            if install_option[0] == config_type:
37 37 
                 if install_option[1]["include"] != "none":
38 38 
                     for include_type in install_option[1]["include"].split(','):
39 39 
                         package_list = package_list + self.get_packages_to_install(options, base_path, include_type)
... ... 
@@ -54,8 +54,8 @@ class PackageSelector(object):
54 54
55 55 
         for install_option in options_sorted:
56 56 
             if install_option[1]["visible"] == True:
57 
-                package_list = self.get_packages_to_install(options_sorted, base_path, install_option[1]["type"])
58 
-                self.package_menu_items.append((install_option[1]["title"], self.exit_function, [install_option[1]["type"], package_list] ))
57 
+                package_list = self.get_packages_to_install(options_sorted, base_path, install_option[0])
58 
+                self.package_menu_items.append((install_option[1]["title"], self.exit_function, [install_option[0], package_list] ))
59 59
60 60 
         self.package_menu = Menu(self.menu_starty,  self.maxx, self.package_menu_items)
61 61
installer/photonInstaller.py
History View file @ 05640f9
... ... 
@@ -156,7 +156,7 @@ if __name__ == '__main__':
156 156 
     packages = []
157 157 
     if config['iso_system'] == True:
158 158 
         for install_option in options_sorted:
159 
-            if install_option[1]['type'] == "iso":
159 
+            if install_option[0] == "iso":
160 160 
                 json_wrapper_package_list = JsonWrapper(os.path.join(base_path, install_option[1]["file"]))
161 161 
                 package_list_json = json_wrapper_package_list.read()
162 162 
                 packages = package_list_json["packages"]