# HG changeset patch
# User yiluzhu
# Date 1264517360 0
# Node ID a4bc95a3b539ec63e7cee08d7f2be9400050ab55
# Parent  abc1aa76870fbee0491075a8ec3c20bc38d69e22# Parent  49da1e705345845a1da2c0a746f3bb09a8d4fef6
Merge

diff -r abc1aa76870f -r a4bc95a3b539 sbsv2/raptor/python/plugins/filter_check.py
--- a/sbsv2/raptor/python/plugins/filter_check.py	Tue Jan 26 14:47:06 2010 +0000
+++ b/sbsv2/raptor/python/plugins/filter_check.py	Tue Jan 26 14:49:20 2010 +0000
@@ -26,4 +26,5 @@
         def __init__(self): 
 		super(filter_what.FilterWhat,self).__init__()
 		self.check = True
+		self.path_prefix_to_strip = None
 
diff -r abc1aa76870f -r a4bc95a3b539 sbsv2/raptor/python/raptor_meta.py
--- a/sbsv2/raptor/python/raptor_meta.py	Tue Jan 26 14:47:06 2010 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Tue Jan 26 14:49:20 2010 +0000
@@ -1453,10 +1453,9 @@
 			for cap in toks[1]:
 				cap = cap.lower()
 				self.__debug("Setting  "+toks[0]+": " + cap)
-				if cap != "all":
-					if not cap.startswith("-"):
-						if not cap.startswith("+"):
-							cap = "+" + cap	
+				if not cap.startswith("-"):
+					if not cap.startswith("+"):
+						cap = "+" + cap	
 				self.capabilities.append(cap)
 		elif varname=='DEFFILE':
 			self.__defFileRoot = self.__currentMmpFile
@@ -2215,9 +2214,7 @@
 
 			if capability.startswith('-'):
 				invert = 0xffffffff
-				capability = capability[1:]
-			elif capability.startswith('+'):
-				capability = capability[1:]
+			capability = capability[1:]
 
 			if MMPRaptorBackend.supportedCapabilities.has_key(capability):
 				capabilityFlag1 = capabilityFlag1 ^ invert
diff -r abc1aa76870f -r a4bc95a3b539 sbsv2/raptor/test/smoke_suite/test_resources/simple/capability.mmp
--- a/sbsv2/raptor/test/smoke_suite/test_resources/simple/capability.mmp	Tue Jan 26 14:47:06 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple/capability.mmp	Tue Jan 26 14:49:20 2010 +0000
@@ -31,4 +31,4 @@
 EPOCSTACKSIZE 8192
 EPOCHEAPSIZE 0x5000 65535
 EPOCPROCESSPRIORITY low
-capability ALL -TCB -ProtServ TCB ProtServ -DRM
+capability TCB ALL -TCB -ProtServ TCB ProtServ -DRM