From a21bd79010b9a3a5e1f9e19dca673dcb38f35334 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 15 Oct 2014 15:34:20 -0700 Subject: [PATCH] don't try to assign inventory during an upgrade, #30900 --- FS/FS/svc_Common.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm index 4a2d61786..e4591720d 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 : ''; -- 2.11.0