Merge bd4f599 into 8945019

pyiron · Aug 26, 2020 · c28085b · c28085b
2 parents 8945019 + bd4f599
commit c28085b
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/pyiron/base/job/generic.py b/pyiron/base/job/generic.py
@@ -980,20 +980,20 @@ def run_if_scheduler(self):
             command = "python -m pyiron.cli wrapper -p " \
                       + self.working_directory \
                       + " -j " + str(self.job_id)
-        try:
-            que_id = s.queue_adapter.submit_job(
-                queue=self.server.queue,
-                job_name="pi_" + str(self.job_id),
-                working_directory=self.project_hdf5.working_directory,
-                cores=self.server.cores,
-                run_time_max=self.server.run_time,
-                memory_max=self.server.memory_limit,
-                command=command,
-            )
+        que_id = s.queue_adapter.submit_job(
+            queue=self.server.queue,
+            job_name="pi_" + str(self.job_id),
+            working_directory=self.project_hdf5.working_directory,
+            cores=self.server.cores,
+            run_time_max=self.server.run_time,
+            memory_max=self.server.memory_limit,
+            command=command,
+        )
+        if que_id != None:
             self.server.queue_id = que_id
             self._server.to_hdf(self._hdf5)
             print("Queue system id: ", que_id)
-        except subprocess.CalledProcessError as e:
+        else:
             self._logger.warning("Job aborted")
             self._logger.warning(e.output)
             self.status.aborted = True