Mercurial > hgrepos > Python > libs > ConfigMix

changeset 25:baf862cb4860

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle "None" variable values when substituting
author Franz Glasner <f.glasner@feldmann-mg.com>
date Thu, 10 Mar 2016 16:24:45 +0100
parents fa65adab0b71
children 1b8d5c9d294f
files configmix/config.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configmix/config.py	Thu Mar 10 16:18:41 2016 +0100
+++ b/configmix/config.py	Thu Mar 10 16:24:45 2016 +0100
@@ -154,6 +154,8 @@
                 return s
             varname, filters = self._split_filters(s[start+2:end])
             varvalue = self._apply_filters(filters, self.getvar_s(varname))
+            if varvalue is None:
+                varvalue = u("")
             replaced = u(b"{0}{1}").format(s[:start], varvalue)
             s = u(b"{0}{1}").format(replaced, s[end+2:])
             # don't re-evaluate because `self.getvar_s()` expands already