Remove residual Lab & configuration DEA and DHA from the unprotected Fuel repo

[fuel.git] / deploy / deploy-config.py

diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
index 5351c14..65d51b2 100644 (file)
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@ -78,12 +78,18 @@ def parse_arguments():
               'output_path': args.output_path}
     return kwargs
 
+def warning(msg):
+    red = '\033[0;31m'
+    NC = '\033[0m'
+    print('%(red)s WARNING: %(msg)s %(NC)s' % {'red': red,
+                                               'msg': msg,
+                                               'NC': NC})
+
 def setup_yaml():
-  represent_dict_order = lambda self, data:  self.represent_mapping('tag:yaml.org,2002:map', data.items())
-  yaml.add_representer(collections.OrderedDict, represent_dict_order)
+    represent_dict_order = lambda self, data:  self.represent_mapping('tag:yaml.org,2002:map', data.items())
+    yaml.add_representer(collections.OrderedDict, represent_dict_order)
 
 def sha_uri(uri):
-    import hashlib
     response = urllib2.urlopen(uri)
     data = response.read()
     sha1 = hashlib.sha1()
@@ -114,10 +120,11 @@ def merge_lists(list1, list2):
             if 'plugin_version' in list1[0].get('metadata', {}):
                 return merge_fuel_plugin_version_list(list1, list2)
             else:
-                raise Exception("Lists with dics inside are not merge able! "
-                                "You have to code the merge them. "
+                warning("Lists with dictionary inside are not merge able! "
+                                "List2 will overwrite List1. "
                                 "List1: %s; List2: %s"
                                 % (list1, list2))
+                return list2
         else:
             return list2
     elif list1: