From: Mark Wells <mark@freeside.biz>
Date: Mon, 5 Mar 2012 19:18:48 +0000 (-0800)
Subject: make svc_broadband upgrade errors non-fatal
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d6db98350a6cf0f7715a8346ca0184fab827bcee

make svc_broadband upgrade errors non-fatal
---

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 6f5e170a3..ddeab044a 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -602,7 +602,7 @@ sub _upgrade_data {
       # (other than setting blocknum to null for a non-auto-assigned router)
       if ( $self->ip_addr ne $ip_addr 
         or ($self->blocknum and $self->blocknum != $addr_block->blocknum)) {
-        die "Upgrading service ".$self->svcnum." would change its block/address.\n\nCheck your router and address block configuration.\n";
+        warn "WARNING: Upgrading service ".$self->svcnum." would change its block/address; skipped.\n";
         next;
       }