mirror of https://github.com/openXC7/prjxray.git
mergedb: use parsedb to validate merges
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
parent
7f95ce3996
commit
59603f069b
|
|
@ -71,6 +71,6 @@ esac
|
|||
|
||||
touch "$db"
|
||||
sort -u "$tmp1" "$db" | grep -v '<.*>' > "$tmp2" || true
|
||||
mv "$tmp2" "$db"
|
||||
${XRAY_PARSEDB} --strict "$tmp2" "$db"
|
||||
rm -f "$tmp1"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue