From 1bdf4dbe4f404eab7449491ab074018a96c51e24 Mon Sep 17 00:00:00 2001
From: Matt Guthaus <mrg@ucsc.edu>
Date: Mon, 28 Jan 2019 17:07:38 -0800
Subject: [PATCH] Re-enable abort on supply error.

---
 compiler/verify/calibre.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compiler/verify/calibre.py b/compiler/verify/calibre.py
index 4eb05448..a1bbbc3e 100644
--- a/compiler/verify/calibre.py
+++ b/compiler/verify/calibre.py
@@ -182,10 +182,7 @@ def run_lvs(cell_name, gds_name, sp_name, final_verification=False):
         # FIXME: Remove when vdd/gnd connected        
         #'lvsAbortOnSupplyError' : 0
 
-    # This should be removed for final verification
-    # FIXMEFIXMEFIXME
-    # MRG: Just doing this to merge pdriver
-    if True or not final_verification:
+    if not final_verification:
         lvs_runset['cmnVConnectReport']=1
         lvs_runset['cmnVConnectNamesState']='SOME'
         lvs_runset['cmnVConnectNames']='vdd gnd'