diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
| commit | 7d39cd191c885608731a82a2cedf2b8953d3bf1c (patch) | |
| tree | 6f3003ab8d9b0284d86637849a2d5473ae878005 /tools/indent.py | |
| parent | d0be47e8e152e82270770bdb77aea620ea9b3ab2 (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
Conflicts:
bgpd/bgp_attr.c
Diffstat (limited to 'tools/indent.py')
| -rwxr-xr-x[-rw-r--r--] | tools/indent.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/indent.py b/tools/indent.py index 560c13c77d..91bb23f67c 100644..100755 --- a/tools/indent.py +++ b/tools/indent.py @@ -13,7 +13,7 @@ define_re = re.compile( re.M | re.S) # find clang-format control that we just inserted clean_re = re.compile( - r'^/\* \$FRR indent\$ \*/\s*\n\s*/\* clang-format (on|off) \*/\s*\n', + r'^.*/\* \$FRR indent\$ \*/\s*\n\s*/\* clang-format (on|off) \*/\s*\n', re.M) def wrap_file(fn): |