From b837d4cc6fb9424cb13b04a0ddabd079f5b4841b Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 16 Jul 2018 18:37:26 -0700
Subject: [PATCH] no need for errors decrypting inadvertantly encrypted payinfo
 to be fatal, RT#76385

---
 FS/FS/Upgrade.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 0069e207a..92a056c02 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -338,7 +338,10 @@ sub upgrade {
       });
       foreach my $object ( @objects ) {
           my $payinfo = $object->decrypt($object->payinfo);
-          die "error decrypting payinfo" if $payinfo eq $object->payinfo;
+          if ( $payinfo eq $object->payinfo ) {
+            warn "error decrypting payinfo for $table: $payinfo\n";
+            next;
+          }
           $object->payinfo($payinfo);
           my $error = $object->replace;
           die $error if $error;
-- 
2.11.0