Project

General

Profile

« Previous | Next » 

Revision 1800

join: Also print "No join mapping" warning if a join mapping was found but it was empty. The warning in that case is actually "No non-empty join mapping" to distinguish it from a mapping that's missing entirely. input.Makefile: missing_mappings: Support new "No join mapping" error message.

View differences:

inputs/input.Makefile
198 198
missing_%_mappings: _always # stem is one of join|input
199 199
	@echo $(emph)"Missing $* mappings:"$(endEmph)
200 200
	@+$(selfMake) remake 2>&1\
201
|$(SED) -n 's/^.*No $* mapping for ([0-9A-Za-z_-]+).*$$/\1/p'\
201
|$(SED) -n 's/^.*No.* $* mapping for ([0-9A-Za-z_-]+).*$$/\1/p'\
202 202
$(if $(filter join,$*),|$(bin)/ucase_first 0)|sort|uniq
203 203

  
204 204
##### External dependencies
bin/join
60 60
                    suffix = sep+new_suffix+suffix # prepend new suffix
61 61
            
62 62
            # Write new mapping
63
            if out_row != None:
63
            if out_row != None and out_row[1] != '': # found non-empty mapping
64 64
                row = maps.merge_mappings(row, out_row)
65 65
                if row[1] != '': row[1] += suffix # don't modify out_row!
66
            else: set_error('No join mapping for '+out_orig)
66
            else:
67
                msg = 'No'
68
                if out_row != None: msg += ' non-empty'
69
                msg += ' join mapping for '+out_orig
70
                set_error(msg)
67 71
        elif row[2] == '': # also no comment explaining why no input mapping
68 72
            set_error('No input mapping for '+row[0])
69 73
        

Also available in: Unified diff