Merge pull request #232 from markito3/revise_jana_patch

cast SHOWBUILD as an integer before comparing to 0
JeffersonLab · Jan 23, 2022 · bd044a9 · bd044a9
2 parents a39d5eb + 1ed8929
commit bd044a9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/patches/jana/sbms_config.py.082.patch b/patches/jana/sbms_config.py.082.patch
@@ -1,5 +1,5 @@
---- sbms_config.py.original	2020-10-21 16:56:45.153504000 -0400
-+++ sbms_config.py.patched	2020-10-21 16:57:46.512910600 -0400
+--- sbms_config.py.original	2020-07-07 14:28:39.000000000 -0400
++++ sbms_config.py.fixed	2022-01-21 18:33:53.541971824 -0500
 @@ -55,7 +55,7 @@
  	ofdirname = '%s/JANA' % env['variant_dir']
  	ofdir = '%s' % env.Dir(ofdirname)
@@ -9,16 +9,18 @@
 
  	# ROOT
  	HAVE_ROOT = 0
-@@ -92,12 +92,12 @@
+@@ -91,13 +91,13 @@
+ 	env['HAVE_CCDB']   = HAVE_CCDB
 
  	# If showing build, print config. results
- 	if(env['SHOWBUILD']>0):
+-	if(env['SHOWBUILD']>0):
 -		print '--- Configuration results ----'
 -		print '    HAVE_ROOT = %d' % HAVE_ROOT
 -		print '  HAVE_XERCES = %d' % HAVE_XERCES
 -		print '      XERCES3 = %d' % XERCES3
 -		print '    HAVE_CCDB = %d' % HAVE_CCDB
 -		print '------------------------------'
++	if(int(env['SHOWBUILD'])>0):
 +		print('--- Configuration results ----')
 +		print('    HAVE_ROOT = %d' % HAVE_ROOT)
 +		print('  HAVE_XERCES = %d' % HAVE_XERCES)