# HG changeset patch
# User Iain Williamson <iain.williamson@nokia.com>
# Date 1275579288 -3600
# Node ID 6209aeff0f730e652a39efc610cc84b3fddecf78
# Parent  e26b09d36de01e9184de173cd085607ee27f8f3b
Fixing sbs_filter issue.

diff -r e26b09d36de0 -r 6209aeff0f73 sbsv2/raptor/bin/sbs_filter.py
--- a/sbsv2/raptor/bin/sbs_filter.py	Fri May 28 15:15:09 2010 +0100
+++ b/sbsv2/raptor/bin/sbs_filter.py	Thu Jun 03 16:34:48 2010 +0100
@@ -46,7 +46,7 @@
 	sys.exit(1)
 
 # construct a Raptor object from our command-line (less the name of this script)
-the_raptor = raptor.Raptor.CreateCommandlineBuild(sys.argv[1:])
+the_raptor = raptor.Raptor.CreateCommandlineAnalysis(sys.argv[1:])
 
 # from Raptor.OpenLog()
 try:
diff -r e26b09d36de0 -r 6209aeff0f73 sbsv2/raptor/python/raptor.py
--- a/sbsv2/raptor/python/raptor.py	Fri May 28 15:15:09 2010 +0100
+++ b/sbsv2/raptor/python/raptor.py	Thu Jun 03 16:34:48 2010 +0100
@@ -799,8 +799,10 @@
 		self.args = args
 
 		# assuming self.CLI = "raptor_cli"
-		more_to_do = raptor_cli.GetArgs(self, args)
+		if not raptor_cli.GetArgs(self, args):
+			self.skipAll = True		# nothing else to do
 
+	def ParseCommandLineTargets(self):
 		# resolve inter-argument dependencies.
 		# --what or --check implies the WHAT target and FilterWhat Filter
 		if self.doWhat or self.doCheck:
@@ -840,8 +842,6 @@
 				"""
 				self.filterList += ",filtercopyfile"
 
-		if not more_to_do:
-			self.skipAll = True		# nothing else to do
 
 	def ProcessConfig(self):
 		# this function will perform additional processing of config
@@ -1353,9 +1353,21 @@
 		build.ConfigFile()
 		build.ProcessConfig()
 		build.CommandLine(argv)
+		build.ParseCommandLineTargets()
 
 		return build
+	
+	@classmethod
+	def CreateCommandlineAnalysis(cls, argv):
+		""" Perform an analysis run where a build is not performed. """
+		build = Raptor()
+		build.AssertBuildOK()
+		build.ConfigFile()
+		build.ProcessConfig()
+		build.CommandLine(argv)
+		# Don't parse command line targets - they don't make any sense if you're not doing a build
 
+		return build
 
 
 # Class for passing constricted parameters to filters
diff -r e26b09d36de0 -r 6209aeff0f73 sbsv2/raptor/python/raptor_version.py
--- a/sbsv2/raptor/python/raptor_version.py	Fri May 28 15:15:09 2010 +0100
+++ b/sbsv2/raptor/python/raptor_version.py	Thu Jun 03 16:34:48 2010 +0100
@@ -16,7 +16,7 @@
 
 # replace CHANGESET with the Hg changeset for ANY release
 
-version=(2,14,1,"2010-06-01","symbian build system","CHANGESET")
+version=(2,14,1,"2010-06-03","symbian build system","CHANGESET")
 
 def numericversion():
 	"""Raptor version string"""