[freeside-commits] branch master updated. 9e0c782a41292cac8d06f0a3b3ef54b7dc5f5a27

Mark Wells mark at 420.am
Tue Feb 26 21:18:46 PST 2013


The branch, master has been updated
       via  9e0c782a41292cac8d06f0a3b3ef54b7dc5f5a27 (commit)
       via  46012a1b4f0c95cce0fb60537125ee43386ef09e (commit)
      from  65889c64e8943f08772c841f61a62f7c5d252e7b (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 9e0c782a41292cac8d06f0a3b3ef54b7dc5f5a27
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Feb 26 21:06:51 2013 -0800

    strip _ out of MAC address fields, #19114

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 3b0b015..869d9a5 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -382,7 +382,7 @@ sub check {
 
   # remove delimiters
   my $mac_addr = uc($self->get('mac_addr'));
-  $mac_addr =~ s/[-: ]//g;
+  $mac_addr =~ s/[\W_]//g;
   $self->set('mac_addr', $mac_addr);
 
   my $error =
diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm
index af6865f..96502e4 100644
--- a/FS/FS/svc_hardware.pm
+++ b/FS/FS/svc_hardware.pm
@@ -164,7 +164,7 @@ sub check {
   return $x unless ref $x;
 
   my $hw_addr = $self->getfield('hw_addr');
-  $hw_addr = join('', split(/\W/, $hw_addr));
+  $hw_addr = join('', split(/[_\W]/, $hw_addr));
   if ( $conf->exists('svc_hardware-check_mac_addr') ) {
     $hw_addr = uc($hw_addr);
     $hw_addr =~ /^[0-9A-F]{12}$/ 

commit 46012a1b4f0c95cce0fb60537125ee43386ef09e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Feb 26 20:51:12 2013 -0800

    fix missing file warning

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 4d6bb12..0214fe7 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -149,7 +149,6 @@ FS/part_pkg/sqlradacct_hour.pm
 FS/part_pkg/subscription.pm
 FS/part_pkg/voip_sqlradacct.pm
 FS/part_pkg/voip_cdr.pm
-FS/part_pkg/base_delayed.pm
 FS/part_pop_local.pm
 FS/part_referral.pm
 FS/part_svc.pm

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

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




More information about the freeside-commits mailing list