From fa0be6832033d8f12d3bab37d9c92814173d589a Mon Sep 17 00:00:00 2001
From: Bastian Eicher <bastian@eicher.net>
Date: Fri, 20 May 2011 06:28:02 +0200
Subject: [PATCH] Added "mode" to <environment>'s _toxml method

---
 tests/Source.xml              | 1 +
 tests/testselections.py       | 7 ++++++-
 zeroinstall/injector/model.py | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/Source.xml b/tests/Source.xml
index 64509bf..dd21434 100644
--- a/tests/Source.xml
+++ b/tests/Source.xml
@@ -11,6 +11,7 @@
     <requires interface='http://foo/Compiler.xml'>
       <environment name='PATH' insert='bin'/>
       <environment name='NO_PATH' value='bin'/>
+      <environment name='BINDIR' insert='bin' mode='replace'/>
     </requires>
     <implementation id='sha1=234' version='1' version-modifier='.0' arch='*-src' compile:command='make'>
       <archive href='foo' size='10'/>
diff --git a/tests/testselections.py b/tests/testselections.py
index f086358..c2d2478 100755
--- a/tests/testselections.py
+++ b/tests/testselections.py
@@ -52,13 +52,18 @@ class TestSelections(BaseTest):
 			self.assertEquals(1, len(sels[1].dependencies))
 			dep = sels[1].dependencies[0]
 			self.assertEquals('http://foo/Compiler.xml', dep.interface)
-			self.assertEquals(2, len(dep.bindings))
+			self.assertEquals(3, len(dep.bindings))
 			self.assertEquals('bin', dep.bindings[0].insert)
 			self.assertEquals('PATH', dep.bindings[0].name)
+			self.assertEquals('prepend', dep.bindings[0].mode)
 
 			self.assertEquals('bin', dep.bindings[1].value)
 			self.assertEquals('NO_PATH', dep.bindings[1].name)
 
+			self.assertEquals('bin', dep.bindings[2].insert)
+			self.assertEquals('BINDIR', dep.bindings[2].name)
+			self.assertEquals('replace', dep.bindings[2].mode)
+
 			self.assertEquals(["sha1=345"], sels[0].digests)
 
 		s1 = selections.Selections(p)
diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py
index 1384034..82833a6 100644
--- a/zeroinstall/injector/model.py
+++ b/zeroinstall/injector/model.py
@@ -294,6 +294,8 @@ class EnvironmentBinding(Binding):
 		"""
 		env_elem = doc.createElementNS(XMLNS_IFACE, 'environment')
 		env_elem.setAttributeNS(None, 'name', self.name)
+		if self.mode is not None:
+			env_elem.setAttributeNS(None, 'mode', self.mode)
 		if self.insert is not None:
 			env_elem.setAttributeNS(None, 'insert', self.insert)
 		else:
-- 
2.11.4.GIT