Commits

Michał Górny committed c784a4e

Preserve .callenv when overriding it for VCS-es.

  • Participants
  • Parent commits f3dad93

Comments (0)

Files changed (2)

File smartliverebuild/vcs/bzr.py

 	reqenv = ['EBZR_REPO_URI', 'EBZR_REVNO', 'EBZR_REVNO_CMD']
 	optenv = ['EBZR_REVISION']
 
-	callenv = {'BZR_LOG': '/dev/null'}
+	@property
+	def callenv(self):
+		env = RemoteVCSSupport.callenv.fget(self).copy()
+		env.update({'BZR_LOG': '/dev/null'})
+		return env
 
 	def __init__(self, *args, **kwargs):
 		RemoteVCSSupport.__init__(self, *args, **kwargs)

File smartliverebuild/vcs/subversion.py

 	reqenv = ['ESVN_REPO_URI', 'ESVN_STORE_DIR', 'ESVN_WC_REVISION']
 	optenv = ['ESVN_REVISION']
 
-	callenv = {'LC_ALL': 'C'}
 	revre = re.compile('(?m)^Last Changed Rev: (\d+)$')
 
+	@property
+	def callenv(self):
+		env = RemoteVCSSupport.callenv.fget(self).copy()
+		env.update({'LC_ALL': 'C'})
+		return env
+
 	def __init__(self, *args, **kwargs):
 		RemoteVCSSupport.__init__(self, *args, **kwargs)
 		if self.env['ESVN_REPO_URI'] and self.env['ESVN_REPO_URI'].find('@') != -1: