From b1796680dd26c9a9eafdd6d4d73fd136a30a9f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Mon, 8 Jul 2019 16:09:03 +0200 Subject: _yaml.pyx: Fix file index checks for synthetic nodes Fixes #1051. --- src/buildstream/_yaml.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buildstream/_yaml.pyx b/src/buildstream/_yaml.pyx index 678374272..b1fee9be3 100644 --- a/src/buildstream/_yaml.pyx +++ b/src/buildstream/_yaml.pyx @@ -114,7 +114,7 @@ cdef class ProvenanceInformation: cdef FileInfo fileinfo self.node = nodeish - if (nodeish is None) or (nodeish.file_index is None): + if (nodeish is None) or (nodeish.file_index == _SYNTHETIC_FILE_INDEX): self.filename = "" self.shortname = "" self.displayname = "" @@ -436,7 +436,7 @@ cpdef Node load_data(str data, int file_index=_SYNTHETIC_FILE_INDEX, str file_na .format(type(contents[0]).__name__, file_name)) # Store this away because we'll use it later for "top level" provenance - if file_index is not None: + if file_index != _SYNTHETIC_FILE_INDEX: f_info = _FILE_LIST[file_index] _FILE_LIST[file_index] = FileInfo( -- cgit v1.2.1