File tree Expand file tree Collapse file tree 1 file changed +19
-3
lines changed Expand file tree Collapse file tree 1 file changed +19
-3
lines changed Original file line number Diff line number Diff line change @@ -92,10 +92,19 @@ function injectAllRequirements(funcArtifact) {
92
92
return BbPromise . resolve ( ) ;
93
93
}
94
94
95
- this . serverless . cli . log ( 'Injecting required Python packages to package...' ) ;
95
+ let injectProgress ;
96
+ if ( this . progress ) {
97
+ injectProgress = this . progress . get ( 'python-inject-requirements' ) ;
98
+ injectProgress . update ( 'Injecting required Python packages to package' , {
99
+ isMainEvent : true ,
100
+ } ) ;
101
+ } else {
102
+ this . serverless . cli . log ( 'Injecting required Python packages to package...' ) ;
103
+ }
96
104
105
+ let returnPromise ;
97
106
if ( this . serverless . service . package . individually ) {
98
- return BbPromise . resolve ( this . targetFuncs )
107
+ returnPromise = BbPromise . resolve ( this . targetFuncs )
99
108
. filter ( ( func ) =>
100
109
( func . runtime || this . serverless . service . provider . runtime ) . match (
101
110
/ ^ p y t h o n .* /
@@ -132,12 +141,19 @@ function injectAllRequirements(funcArtifact) {
132
141
) ;
133
142
} ) ;
134
143
} else if ( ! this . options . zip ) {
135
- return injectRequirements (
144
+ returnPromise = injectRequirements (
136
145
path . join ( '.serverless' , 'requirements' ) ,
137
146
this . serverless . service . package . artifact || funcArtifact ,
138
147
this . options
139
148
) ;
140
149
}
150
+
151
+ return returnPromise
152
+ . then ( ( ) => injectProgress && injectProgress . remove ( ) )
153
+ . catch ( ( e ) => {
154
+ injectProgress && injectProgress . remove ( ) ;
155
+ throw e ;
156
+ } ) ;
141
157
}
142
158
143
159
module . exports = { injectAllRequirements } ;
You can’t perform that action at this time.
0 commit comments