summaryrefslogtreecommitdiff
path: root/FS/FS/svc_Common.pm
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2014-10-15 15:34:09 -0700
committerMark Wells <mark@freeside.biz>2014-10-15 15:34:09 -0700
commit79a01ef71d4522b59c739fb08c231624df0adce0 (patch)
treee260615479c1f806868d63dbd5dc9ae7717feab5 /FS/FS/svc_Common.pm
parent81ccfc6f631270015f2ae11d4019c4b8b9ce7514 (diff)
don't try to assign inventory during an upgrade, #30900
Diffstat (limited to 'FS/FS/svc_Common.pm')
-rw-r--r--FS/FS/svc_Common.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 659255eaa..9c2592213 100644
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -807,6 +807,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 : '';