[freeside-commits] branch master updated. a21bd79010b9a3a5e1f9e19dca673dcb38f35334

[Mark Wells]

The branch, master has been updated
       via  a21bd79010b9a3a5e1f9e19dca673dcb38f35334 (commit)
      from  83e442de6a041fa3b7580d53912eeb1490ddf47c (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 a21bd79010b9a3a5e1f9e19dca673dcb38f35334
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Oct 15 15:34:20 2014 -0700

    don't try to assign inventory during an upgrade, #30900

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 4a2d617..e459172 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -804,6 +804,9 @@ If there is an error, returns the error, otherwise returns false.
 =cut
 
 sub set_auto_inventory {
+  # don't try to do this during an upgrade
+  return '' if $FS::CurrentUser::upgrade_hack;
+
   my $self = shift;
   my $old = @_ ? shift : '';
 

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

Summary of changes:
 FS/FS/svc_Common.pm |    3 +++
 1 file changed, 3 insertions(+)