added qsub changes to Condor

Author: satra

nipype/pipeline/plugins/condor.py

@@ -60,6 +60,14 @@ def _submit_batchtask(self, scriptfile, node):
         cmd = CommandLine('condor_qsub', environ=os.environ.data)
         path = os.path.dirname(scriptfile)
         qsubargs = ''
+        if self._qsub_args:
+            qsubargs = self._qsub_args
+        if 'qsub_args' in node.plugin_args:
+            if 'overwrite' in node.plugin_args and\
+               node.plugin_args['overwrite']:
+                qsubargs = node.plugin_args['qsub_args']
+            else:
+                qsubargs += (" " + node.plugin_args['qsub_args'])
         if self._qsub_args:
             qsubargs = self._qsub_args
         if '-o' not in qsubargs: