diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-08-09 20:28:35 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-08-09 20:28:35 +0000 |
| commit | e52c05cd8079defe2c7524e61b3241174fa969d0 (patch) | |
| tree | 6549d5784c3556dd4f1c66924f767e91afa03745 /lib/command_parse.y | |
| parent | 07079d78bc849dacc7b90c7fec6949687b344974 (diff) | |
lib: Revert breaking change to cmp_node
Bad conditional refactor broke graph deduplication
and thus disambiguation precedence
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'lib/command_parse.y')
| -rw-r--r-- | lib/command_parse.y | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/command_parse.y b/lib/command_parse.y index bbdf11c6e8..690832357a 100644 --- a/lib/command_parse.y +++ b/lib/command_parse.y @@ -478,8 +478,11 @@ cmp_node (struct graph_node *first, struct graph_node *second) switch (first->type) { case WORD_GN: case VARIABLE_GN: - if (first->text && second->text && strcmp (first->text, second->text)) - return 0; + if (first->text && second->text) + { + if (strcmp (first->text, second->text)) + return 0; + } else if (first->text != second->text) return 0; break; case RANGE_GN: |