@@ -197,38 +197,38 @@ def launch_java(
197
197
return subprocess .run ((java , '-cp' , cp ) + jvm_args + (main_class ,) + app_args , stdout = stdout , stderr = stderr , ** subprocess_run_kwargs )
198
198
199
199
def run_and_combine_outputs (command , * args ):
200
- try :
201
- return subprocess .check_output ((command ,) + args , stderr = subprocess .STDOUT )
202
- except subprocess .CalledProcessError as e :
203
- _logger .error ("Error in `%s': %d" , ' ' .join (e .cmd ), e .returncode )
204
- _logger .debug ("Exception: %s" , e )
205
- _logger .debug ("Debug Trace:" , exc_info = True )
206
- if e .stdout :
207
- _logger .debug ("\t std out:" )
208
- for l in str (e .stdout ).split ('\\ n' ):
209
- _logger .debug ('\t \t %s' , l )
210
- if e .stderr :
211
- _logger .debug ("\t std err:" )
212
- for l in str (e .stderr ).split ('\\ n' ):
213
- _logger .debug ('\t \t %s' , l )
214
- # parser.print_help(file=sys.stderr)
215
- sys .exit (e .returncode )
216
-
217
- except NoMainClassInManifest as e :
218
- _logger .error (e )
219
- _logger .error ("No main class given, and none found." )
220
- # parser.print_help(file=sys.stderr)
221
- sys .exit (1 )
222
-
223
- except HelpRequested as e :
224
- pass
225
- #parser.parse_known_args(e.argv)
226
-
227
- except Exception as e :
228
- _logger .error (e )
229
- traceback .print_tb (e .__traceback__ )
230
- parser .print_help (file = sys .stderr )
231
- sys .exit (1 )
200
+ try :
201
+ return subprocess .check_output ((command ,) + args , stderr = subprocess .STDOUT )
202
+ except subprocess .CalledProcessError as e :
203
+ _logger .error ("Error in `%s': %d" , ' ' .join (e .cmd ), e .returncode )
204
+ _logger .debug ("Exception: %s" , e )
205
+ _logger .debug ("Debug Trace:" , exc_info = True )
206
+ if e .stdout :
207
+ _logger .debug ("\t std out:" )
208
+ for l in str (e .stdout ).split ('\\ n' ):
209
+ _logger .debug ('\t \t %s' , l )
210
+ if e .stderr :
211
+ _logger .debug ("\t std err:" )
212
+ for l in str (e .stderr ).split ('\\ n' ):
213
+ _logger .debug ('\t \t %s' , l )
214
+ # parser.print_help(file=sys.stderr)
215
+ sys .exit (e .returncode )
216
+
217
+ except NoMainClassInManifest as e :
218
+ _logger .error (e )
219
+ _logger .error ("No main class given, and none found." )
220
+ # parser.print_help(file=sys.stderr)
221
+ sys .exit (1 )
222
+
223
+ except HelpRequested as e :
224
+ pass
225
+ #parser.parse_known_args(e.argv)
226
+
227
+ except Exception as e :
228
+ _logger .error (e )
229
+ traceback .print_tb (e .__traceback__ )
230
+ parser .print_help (file = sys .stderr )
231
+ sys .exit (1 )
232
232
233
233
def find_endpoint (argv , shortcuts = {}):
234
234
# endpoint is first positional argument
@@ -275,7 +275,7 @@ def jgo_parser():
275
275
return parser
276
276
277
277
def jgo_main (argv = sys .argv [1 :], stdout = None , stderr = None ):
278
-
278
+
279
279
LOG_FORMAT = '%(levelname)s %(asctime)s: %(message)s'
280
280
logging .basicConfig (
281
281
level = logging .INFO ,
@@ -419,15 +419,15 @@ def resolve_dependencies(
419
419
420
420
maven_project = '''
421
421
<project>
422
- <modelVersion>4.0.0</modelVersion>
423
- <groupId>{groupId}-BOOTSTRAPPER</groupId>
424
- <artifactId>{artifactId}-BOOTSTRAPPER</artifactId>
425
- <version>0</version>
426
- <dependencyManagement>
427
- <dependencies>{depMgmt}</dependencies>
428
- </dependencyManagement>
429
- <dependencies>{deps}</dependencies>
430
- <repositories>{repos}</repositories>
422
+ \t <modelVersion>4.0.0</modelVersion>
423
+ \t <groupId>{groupId}-BOOTSTRAPPER</groupId>
424
+ \t <artifactId>{artifactId}-BOOTSTRAPPER</artifactId>
425
+ \t <version>0</version>
426
+ \t <dependencyManagement>
427
+ \t \t <dependencies>{depMgmt}</dependencies>
428
+ \t </dependencyManagement>
429
+ \t <dependencies>{deps}</dependencies>
430
+ \t <repositories>{repos}</repositories>
431
431
</project>
432
432
''' .format (
433
433
groupId = primary_endpoint .groupId ,
0 commit comments