[freeside-commits] branch master updated. d6db98350a6cf0f7715a8346ca0184fab827bcee

[Mark Wells]

The branch, master has been updated
       via  d6db98350a6cf0f7715a8346ca0184fab827bcee (commit)
      from  abda8f1ecbf9161a3828e778aec5cb3762105475 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d6db98350a6cf0f7715a8346ca0184fab827bcee
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Mar 5 11:18:48 2012 -0800

    make svc_broadband upgrade errors non-fatal

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 6f5e170..ddeab04 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;
       }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/svc_broadband.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)