equal
deleted
inserted
replaced
795 |
795 |
796 r = linematch(el, lout) |
796 r = linematch(el, lout) |
797 if isinstance(r, str): |
797 if isinstance(r, str): |
798 if r == '+glob': |
798 if r == '+glob': |
799 lout = el[:-1] + ' (glob)\n' |
799 lout = el[:-1] + ' (glob)\n' |
800 r = 0 # warn only |
800 r = '' # warn only this line |
801 elif r == '-glob': |
801 elif r == '-glob': |
802 lout = ''.join(el.rsplit(' (glob)', 1)) |
802 lout = ''.join(el.rsplit(' (glob)', 1)) |
803 r = 0 # warn only |
803 r = '' # warn only this line |
804 else: |
804 else: |
805 log('\ninfo, unknown linematch result: %r\n' % r) |
805 log('\ninfo, unknown linematch result: %r\n' % r) |
806 r = False |
806 r = False |
807 if r: |
807 if r: |
808 postout.append(" " + el) |
808 postout.append(" " + el) |
809 else: |
809 else: |
810 if needescape(lout): |
810 if needescape(lout): |
811 lout = stringescape(lout.rstrip('\n')) + " (esc)\n" |
811 lout = stringescape(lout.rstrip('\n')) + " (esc)\n" |
812 postout.append(" " + lout) # let diff deal with it |
812 postout.append(" " + lout) # let diff deal with it |
813 if r != 0: # != warn only |
813 if r != '': # if line failed |
814 warnonly = False |
814 warnonly = False |
815 |
815 |
816 if lcmd: |
816 if lcmd: |
817 # add on last return code |
817 # add on last return code |
818 ret = int(lcmd.split()[1]) |
818 ret = int(lcmd.split()[1]) |