fix: make filters work with new default python fix
authortimothy.murphy@nokia.com
Tue, 09 Feb 2010 15:48:43 +0200
branchfix
changeset 198 53dd6a549481
parent 196 c0d1d904d868
child 199 3776a92b44bb
fix: make filters work with new default python fix: Make Check filter actually check stuff when run from the filter
sbsv2/raptor/bin/sbs_filter
sbsv2/raptor/python/plugins/filter_what.py
--- a/sbsv2/raptor/bin/sbs_filter	Mon Feb 08 22:47:19 2010 +0200
+++ b/sbsv2/raptor/bin/sbs_filter	Tue Feb 09 15:48:43 2010 +0200
@@ -45,8 +45,8 @@
 
 	__MINGW__=${SBS_MINGW:-$SBS_HOME/$HOSTPLATFORM_DIR/mingw}
 	__CYGWIN__=${SBS_CYGWIN:-$SBS_HOME/$HOSTPLATFORM_DIR/cygwin}
-	__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python252/python.exe}
-	export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python252}
+	__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python264/python.exe}
+	export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python264}
 
     # Command for unifying path strings. For example, "c:\some\path" and
     # "/cygdrive/c/some/path" will both be converted into "c:/some/path".
--- a/sbsv2/raptor/python/plugins/filter_what.py	Mon Feb 08 22:47:19 2010 +0200
+++ b/sbsv2/raptor/python/plugins/filter_what.py	Tue Feb 09 15:48:43 2010 +0200
@@ -64,7 +64,8 @@
 		"initialise"
 		
 		self.buildparameters = build_parameters
-		self.check = build_parameters.doCheck
+		if build_parameters.doCheck:
+			self.check = True
 		self.what = build_parameters.doWhat
 
 		self.outfile = sys.stdout