Update the discover method handling

1 files changed, 9 insertions, 5 deletions

diff --git a/hcid/test-device b/hcid/test-device
index 9657b3ae..a4392f77 100755
--- a/hcid/test-device
+++ b/hcid/test-device
@@ -42,14 +42,18 @@ if (sys.argv[1] == "remove"):
 		adapter.RemoveDevice(sys.argv[2])
 	sys.exit(0)
 
-if (sys.argv[1] == "update"):
+if (sys.argv[1] == "discover"):
 	if (len(sys.argv) < 3):
 		print "Need address parameter"
 	else:
 		path = adapter.FindDevice(sys.argv[2])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
-		device.DiscoverServices("");
+		if (len(sys.argv) < 4):
+			pattern = ""
+		else:
+			pattern = sys.argv[3]
+		services = device.DiscoverServices(pattern);
 	sys.exit(0)
 
 if (sys.argv[1] == "class"):
@@ -99,12 +103,12 @@ if (sys.argv[1] == "trusted"):
 			properties = device.GetProperties()
 			print properties["Trusted"]
 		else:
-			if (sys.argv[2] == "yes"):
+			if (sys.argv[3] == "yes"):
 				value = dbus.Boolean(1)
-			elif (sys.argv[2] == "no"):
+			elif (sys.argv[3] == "no"):
 				value = dbus.Boolean(0)
 			else:
-				value = dbus.Boolean(sys.argv[2])
+				value = dbus.Boolean(sys.argv[3])
 			device.SetProperty("Trusted", value)
 	sys.exit(0)