projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
83e442d
)
don't try to assign inventory during an upgrade, #30900
author
Mark Wells
<mark@freeside.biz>
Wed, 15 Oct 2014 22:34:20 +0000
(15:34 -0700)
committer
Mark Wells
<mark@freeside.biz>
Wed, 15 Oct 2014 22:34:20 +0000
(15:34 -0700)
FS/FS/svc_Common.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_Common.pm
b/FS/FS/svc_Common.pm
index
4a2d617
..
e459172
100644
(file)
--- 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 : '';