Skip to content

Commit ab3a71d

Browse files
authored
Merge pull request #919 from JuliaRobotics/22Q4/hack/listnotvecsymbolonde
workaround for listDE inconsistencies (on merge)
2 parents c5eafbd + 9808695 commit ab3a71d

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/DataBlobs/services/AbstractDataEntries.jl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,11 @@ function mergeDataEntries!(
196196
des = _makevec(des_)
197197
# don't add data entries that already exist
198198
dde = listDataEntries(dst, dlbl)
199-
uids = (s->s.id).(dde)
200-
filter!(s -> !(s.id in uids), des)
199+
# HACK, verb list should just return vector of Symbol. NCE36
200+
_getid(s) = s
201+
_getid(s::AbstractDataEntry) = s.id
202+
uids = _getid.(dde) # (s->s.id).(dde)
203+
filter!(s -> !(_getid(s) in uids), des)
201204
# add any data entries not already in the destination variable, by uuid
202205
addDataEntry!.(dst, dlbl, des)
203206
end
@@ -212,8 +215,11 @@ function mergeDataEntries!(
212215
des = listDataEntries(src, slbl)
213216
# don't add data entries that already exist
214217
dde = listDataEntries(dst, dlbl)
215-
uids = (s->s.id).(dde)
216-
filter!(s -> !(s.id in uids), des)
218+
# HACK, verb list should just return vector of Symbol. NCE36
219+
_getid(s) = s
220+
_getid(s::AbstractDataEntry) = s.id
221+
uids = _getid.(dde) # (s->s.id).(dde)
222+
filter!(s -> !(_getid(s) in uids), des)
217223
if 0 < length(des)
218224
union(((s->mergeDataEntries!(dst, dlbl, src, slbl, s.id)).(des))...)
219225
end

0 commit comments

Comments
 (0)