[freeside-commits] branch master updated. ed6005ed23ad123899d5564671838447f7739076

[Mark Wells]

The branch, master has been updated
       via  ed6005ed23ad123899d5564671838447f7739076 (commit)
       via  65cb00ca0af788dfd5a967c99d79ffa4d8cc8c3d (commit)
       via  3d8f79a5a75356f4ce36b8e91c769d72447d74ba (commit)
      from  84f2df8931fa02e63fb21f8f0bb87dd9577b8919 (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 ed6005ed23ad123899d5564671838447f7739076
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 12 16:19:39 2012 -0800

    fix bad race condition

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 7b3097e..58cc5be 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -213,6 +213,7 @@ sub _export_replace {
           return $error;
         }
       }
+      $jobnum = $err_or_queue->jobnum; # chain all of these dependencies
     }
 
     my @del = grep { !exists $new{$_} } keys %old;
@@ -230,6 +231,7 @@ sub _export_replace {
           return $error;
         }
       }
+      $jobnum = $err_or_queue->jobnum; # chain all of these dependencies
     }
   }
 
@@ -561,6 +563,7 @@ sub sqlreplace_usergroups {
       my $error = $err_or_queue->depend_insert( $jobnum );
       return $error if $error;
     }
+    $jobnum = $err_or_queue->jobnum; # chain all of these dependencies
   }
 
   if ( @newgroups ) {

commit 65cb00ca0af788dfd5a967c99d79ffa4d8cc8c3d
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 12 15:15:57 2012 -0800

    fix warning

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 6760d09..7b3097e 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -348,7 +348,7 @@ sub _export_delete {
 
 sub sqlradius_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my %args = @_;
+  #my %args = @_;
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::sqlradius::sqlradius_$method",

commit 3d8f79a5a75356f4ce36b8e91c769d72447d74ba
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 12 15:15:55 2012 -0800

    fix svcpart changes when usergroup is a fixed field, #20458

diff --git a/FS/FS/svc_Radius_Mixin.pm b/FS/FS/svc_Radius_Mixin.pm
index ac97eab..544c7e9 100644
--- a/FS/FS/svc_Radius_Mixin.pm
+++ b/FS/FS/svc_Radius_Mixin.pm
@@ -68,7 +68,8 @@ sub replace  {
 
   $old->usergroup; # make sure this is cached for exports
 
-  my $error =  $new->process_m2m(
+  my $error =  $new->check # make sure fixed fields are set before process_m2m
+            || $new->process_m2m(
                                  'link_table'   => 'radius_usergroup',
                                  'target_table' => 'radius_group',
                                  'params'       => $new->usergroup,

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

Summary of changes:
 FS/FS/part_export/sqlradius.pm |    5 ++++-
 FS/FS/svc_Radius_Mixin.pm      |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)