View | Details | Raw Unified | Return to bug 30984
Collapse All | Expand All

(-)umc/widgets/ProgressBar.js (-2 / +7 lines)
 Lines 114-120    Link Here 
114
			}));
114
			}));
115
		},
115
		},
116
116
117
		auto: function(umcpCommand, umcpOptions, callback, pollErrorMsg, stopComponent, dontHandleErrors) {
117
		auto: function(umcpCommand, umcpOptions, callback, pollErrorMsg, stopComponent, dontHandleErrors, untilDeferred) {
118
			if (untilDeferred && untilDeferred.isFulfilled()) {
119
				// auto caught SIGTERM !
120
				this.stop(callback, stopComponent, !dontHandleErrors);
121
				return;
122
			}
118
			if (pollErrorMsg === undefined) {
123
			if (pollErrorMsg === undefined) {
119
				pollErrorMsg = _('Fetching information from the server failed!');
124
				pollErrorMsg = _('Fetching information from the server failed!');
120
			}
125
			}
 Lines 130-136    Link Here 
130
				if (result) {
135
				if (result) {
131
					this.setInfo(result.component, result.info, result.steps, result.errors, result.critical);
136
					this.setInfo(result.component, result.info, result.steps, result.errors, result.critical);
132
					if (!result.finished) {
137
					if (!result.finished) {
133
						setTimeout(lang.hitch(this, 'auto', umcpCommand, umcpOptions, callback, pollErrorMsg, stopComponent, dontHandleErrors), 200);
138
						setTimeout(lang.hitch(this, 'auto', umcpCommand, umcpOptions, callback, pollErrorMsg, stopComponent, dontHandleErrors, untilDeferred), 200);
134
					}
139
					}
135
				}
140
				}
136
				if (!result || result.finished) {
141
				if (!result || result.finished) {

Return to bug 30984