From 9663579dd01129979dac74d5e8300d3e6699410d Mon Sep 17 00:00:00 2001 From: "D. Mitch Bailey" Date: Wed, 21 Sep 2022 08:05:39 -0700 Subject: [PATCH 1/2] Restore matching circuits if one is empty (but only if pins match). --- VERSION | 2 +- base/netcmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 9110a98..20f5fce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.232 +1.5.232-E1 diff --git a/base/netcmp.c b/base/netcmp.c index cbe10ee..a37fa9e 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -7675,8 +7675,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist) break; } } - if (hasDevices1 != hasDevices2) - result = -2; // Attempt to compare empty cell to non-empty cell + if (hasDevices1 != hasDevices2 && result != 1) + result = -2; // Attempt to compare empty cell to non-empty cell fails if pins don't match exactly if (result < 0) return result; From 2f9e898ec634d21fe9abde4b7c00bfca9d304a03 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Fri, 23 Sep 2022 16:04:49 -0400 Subject: [PATCH 2/2] Version updated along with the merge of pull request #62 from Mitch Bailey. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 20f5fce..df466b5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.232-E1 +1.5.233