Merge pull request #577 from ukkopahis/menu-empty-override

menu: fix error on empty compose-override.yml

Author: Slyke

scripts/buildstack_menu.py

@@ -11,6 +11,7 @@ def main():
   import math
   import sys
   import subprocess
+  import traceback
   from deps.chars import specialChars, commonTopBorder, commonBottomBorder, commonEmptyLine, padText
   from deps.consts import servicesDirectory, templatesDirectory, volumesDirectory, buildCache, envFile, dockerPathOutput, servicesFileName, composeOverrideFile
   from deps.yaml_merge import mergeYaml
@@ -85,7 +86,7 @@ def buildServices(): # TODO: Move this into a dependency so that it can be execu
       return True
     except Exception as err: 
       print("Issue running build:")
-      print(err)
+      traceback.print_exc()
       input("Press Enter to continue...")
       return False
 
@@ -311,7 +312,7 @@ def mainRender(menu, selection, renderType = 1):
 
     except Exception as err: 
       print("There was an error rendering the menu:")
-      print(err)
+      traceback.print_exc()
       print("Press [Esc] to go back")
       return
 
@@ -398,13 +399,13 @@ def checkForIssues():
                 menu[getMenuItemIndexByService(checkedMenuItem)][1]["issues"] = []
             except Exception as err:
               print("Error running checkForIssues on '%s'" % checkedMenuItem)
-              print(err)
+              traceback.print_exc()
               input("Press Enter to continue...")
           else:
             menu[getMenuItemIndexByService(checkedMenuItem)][1]["issues"] = []
         except Exception as err:
           print("Error running checkForIssues on '%s'" % checkedMenuItem)
-          print(err)
+          traceback.print_exc()
           input("Press any key to exit...")
           sys.exit(1)
 
@@ -430,7 +431,7 @@ def checkForOptions():
             menu[getMenuItemIndexByService(menuItem[0])][1]["buildHooks"]["options"] = True
         except Exception as err:
           print("Error running checkForOptions on '%s'" % menuItem[0])
-          print(err)
+          traceback.print_exc()
           input("Press any key to exit...")
           sys.exit(1)
 
@@ -459,7 +460,7 @@ def runPrebuildHook():
               exec(code, execGlobals, execLocals)
           except Exception as err:
             print("Error running PreBuildHook on '%s'" % checkedMenuItem)
-            print(err)
+            traceback.print_exc()
             input("Press Enter to continue...")
             try: # If the prebuild hook modified the docker-compose object, pull it from the script back to here.
               dockerComposeServicesYaml = execGlobals["dockerComposeServicesYaml"]
@@ -490,7 +491,7 @@ def runPostBuildHook():
               exec(code, execGlobals, execLocals)
           except Exception as err:
             print("Error running PostBuildHook on '%s'" % checkedMenuItem)
-            print(err)
+            traceback.print_exc()
             input("Press Enter to continue...")
 
   def executeServiceOptions():

scripts/deps/yaml_merge.py

@@ -1,5 +1,7 @@
 
 def mergeYaml(priorityYaml, defaultYaml):
+  if not priorityYaml:
+      return defaultYaml
   finalYaml = {}
   if isinstance(defaultYaml, dict):
     for dk, dv in defaultYaml.items():