From f5e108e2cbd7f690253a0e918f9efbe65030c49e Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Wed, 6 Jul 2011 10:08:35 +0100
Subject: [PATCH] Renamed <executable> to <executable-in-path>

---
 tests/runnable/RunExec.xml    | 2 +-
 zeroinstall/injector/model.py | 4 ++--
 zeroinstall/injector/run.py   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/runnable/RunExec.xml b/tests/runnable/RunExec.xml
index 416da1c..29654b8 100644
--- a/tests/runnable/RunExec.xml
+++ b/tests/runnable/RunExec.xml
@@ -6,7 +6,7 @@
   <implementation id="test" local-path="." version="1">
     <command name="run" path="go.sh"/>
     <requires interface='./Runnable.xml' command='run'>
-      <executable name='0testprog'/>
+      <executable-in-path name='0testprog'/>
     </requires>
   </implementation>
 </interface>
diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py
index 042dd3a..c52aad9 100644
--- a/zeroinstall/injector/model.py
+++ b/zeroinstall/injector/model.py
@@ -21,7 +21,7 @@ from zeroinstall.injector.namespaces import XMLNS_IFACE
 from zeroinstall.injector import qdom
 
 # Element names for bindings in feed files
-binding_names = frozenset(['environment', 'overlay', 'executable'])
+binding_names = frozenset(['environment', 'overlay', 'executable-in-path'])
 
 network_offline = 'off-line'
 network_minimal = 'minimal'
@@ -135,7 +135,7 @@ def process_binding(e):
 		if binding.insert is not None and binding.value is not None:
 			raise InvalidInterface(_("Binding contains both 'insert' and 'value'"))
 		return binding
-	elif e.name == 'executable':
+	elif e.name == 'executable-in-path':
 		return ExecutableBinding(e)
 	elif e.name == 'overlay':
 		return OverlayBinding(e.getAttribute('src'), e.getAttribute('mount-point'))
diff --git a/zeroinstall/injector/run.py b/zeroinstall/injector/run.py
index eb71300..d727b2c 100644
--- a/zeroinstall/injector/run.py
+++ b/zeroinstall/injector/run.py
@@ -213,9 +213,9 @@ class Setup(object):
 
 	def do_exec_binding(self, binding, dep):
 		if dep is None:
-			raise SafeException("<executable> can only appear within a <requires>")
+			raise SafeException("<%s> can only appear within a <requires>" % binding.qdom.name)
 		if dep.command is None:
-			raise SafeException("<executable> can only appear within a <requires> with a command attribute set")
+			raise SafeException("<%s> can only appear within a <requires> with a command attribute set" % binding.qdom.name)
 		name = binding.name
 		if '/' in name or name.startswith('.') or "'" in name:
 			raise SafeException("Invalid <executable> name '%s'" % name)
-- 
2.11.4.GIT