WIP: rebase fixup

slapos/cli/entry.py

@@ -111,11 +111,11 @@ class SlapOSHelpAction(argparse.Action):
         try:
             factory = ep.load()
         except Exception as err:
-            return 'Could not load %r\n' % ep
+            raise
         try:
             cmd = factory(self, None)
         except Exception as err:
-            return 'Could not instantiate %r: %s\n' % (ep, err)
+            raise
         one_liner = cmd.get_description().split('\n')[0]
         group = getattr(factory, 'command_group', 'other')
         return group, '  %-13s  %s\n' % (name, one_liner)

slapos/grid/SlapObject.py

@@ -640,7 +640,7 @@ class Partition(object):
             'cert_file': self.cert_file,
             'storage_home': self.instance_storage_home,
             'global_ipv4_network_prefix': self.ipv4_global_network,
-            'shared_part_list': '  '.join(self.shared_part_list.strip().splitlines(True))
+            'shared_part_list': '  '.join(self.shared_part_list.strip().splitlines(True)),
             'parameters_md5sum': md5digest(
               json.dumps(
                 self.computer_partition.get("parameters", {}), sort_keys=True
@@ -653,7 +653,7 @@ class Partition(object):
             ),
             'instance_state': self.computer_partition.get("state"),
             'instance_software_type': self.computer_partition.get("software_type"),
-            'instance_processing_timestamp': self.computer_partition.get("processing_timestamp"),
+            'instance_processing_timestamp': self.computer_partition.get("processing_timestamp")
         }
     with open(config_location, 'w') as f:
       f.write(buildout_text)

slapos/grid/slapgrid.py

@@ -1348,8 +1348,8 @@ stderr_logfile_backups=1
       instance_min_free_space=self.instance_min_free_space,
       instance_storage_home=self.instance_storage_home,
       ipv4_global_network=self.ipv4_global_network,
-      partition_timeout=self.partition_timeout
-      api_backward_compatibility=self.api_backward_compatibility,
+      partition_timeout=self.partition_timeout,
+      api_backward_compatibility=self.api_backward_compatibility
     )
 
     # let managers modify current partition