# HG changeset patch
# User raptorbot <raptorbot@systemstesthead.symbian.intra>
# Date 1261166262 0
# Node ID ecf683438dc689855b3382559741075c69a95b64
# Parent  9874c5dbccd7275d6259c3d71545858b2657dd9e
Don't mess around with EPOCROOT until actually entering raptor so we know what the original was
Put the original epocroot back on the front of the whatcomp output.   This allows what output to be
either relative or absolute depending on what your epocroot is.

diff -r 9874c5dbccd7 -r ecf683438dc6 sbsv2/raptor/bin/sbs
--- a/sbsv2/raptor/bin/sbs	Fri Dec 18 18:36:35 2009 +0000
+++ b/sbsv2/raptor/bin/sbs	Fri Dec 18 19:57:42 2009 +0000
@@ -79,7 +79,6 @@
 	__PYTHON__=$($u "$__PYTHON__")
 
 	export SBS_HOME=$($u "$SBS_HOME")
-	export EPOCROOT=$($u "$EPOCROOT")
 
 	export PATH=${__MINGW__}/bin:${__CYGWIN__}/bin:$SBS_HOME/$HOSTPLATFORM_DIR/bin:$PATH
 
diff -r 9874c5dbccd7 -r ecf683438dc6 sbsv2/raptor/bin/sbs_filter
--- a/sbsv2/raptor/bin/sbs_filter	Fri Dec 18 18:36:35 2009 +0000
+++ b/sbsv2/raptor/bin/sbs_filter	Fri Dec 18 19:57:42 2009 +0000
@@ -57,7 +57,6 @@
 	__PYTHON__=$($u "$__PYTHON__")
 
 	export SBS_HOME=$($u "$SBS_HOME")
-	export EPOCROOT=$($u "$EPOCROOT")
 
 	export PATH=${__MINGW__}/bin:${__CYGWIN__}/bin:$SBS_HOME/$HOSTPLATFORM_DIR/bin:$PATH
 
diff -r 9874c5dbccd7 -r ecf683438dc6 sbsv2/raptor/python/plugins/filter_what.py
--- a/sbsv2/raptor/python/plugins/filter_what.py	Fri Dec 18 18:36:35 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_what.py	Fri Dec 18 19:57:42 2009 +0000
@@ -42,7 +42,7 @@
 			if filename.startswith(self.path_prefix_to_strip):
 				filename = filename[len(self.path_prefix_to_strip):]
 			if self.path_prefix_to_add_on != None:
-				filename += self.path_prefix_to_add_on
+				filename = self.path_prefix_to_add_on + filename
 			
 		if self.check:
 			if not os.path.isfile(filename):