Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-02-07 20:01:14 +00:00
2 changed files with 7 additions and 6 deletions

View File

@ -879,9 +879,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
*ptr = '\0';
found = format_find(ft, copy + 1, modifiers);
if (found == NULL) {
log_debug("XXX %s", copy + 1);
found = format_expand(ft, copy + 1);}
if (found == NULL)
found = format_expand(ft, copy + 1);
if (format_choose(ptr + 1, &left, &right) != 0)
goto fail;