/
0147-WebUI-Fix-AddonUninstallFailureHandling.patch
59 lines (57 loc) · 2.68 KB
/
0147-WebUI-Fix-AddonUninstallFailureHandling.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
--- occu/WebUI/www/config/cp_software.cgi.orig
+++ occu/WebUI/www/config/cp_software.cgi
@@ -411,11 +411,11 @@
sendXML: false,
onSuccess: function(transport) {
if (!transport.responseText.match(/^Success/g)){
- alert(translateString(op_name) + translateKey('btnSysConfAdditionalSoftRemoveFailure') + transport.responseText);
+ alert(translateString(op_name) + translateKey('btnSysConfAdditionalSoftRemoveFailure') + transport.responseText.replace(/^Failure\n/, ''));
}else{
alert(translateString(op_name) + translateKey('btnSysConfAdditionalSoftRemoveSuccess'));
- showSoftwareCP();
}
+ showSoftwareCP();
}
};
if ("uninstall" == op)
@@ -480,13 +480,17 @@
import script
import op
- if {[catch {exec $script $op}]} {
- puts "Failure"
+ if {[catch {exec $script $op} result]} {
+ set errorfile /var/log/addon-uninstall-error.log
+ exec echo $result >>$errorfile
+ set result "Failure\nPlease see $errorfile on the central for more details."
+ } else {
+ set result "Success"
}
if { "$op" == "uninstall" } {
exec rm -rf $script
}
- puts "Success"
+ puts $result
}
proc action_image_upload {} {
--- occu/WebUI/www/webui/js/lang/de/translate.lang.extension.js.orig
+++ occu/WebUI/www/webui/js/lang/de/translate.lang.extension.js
@@ -326,7 +326,7 @@
"dialogSetSecKeyLoadBackuplblB" : "Die Zentrale befindet sich im Auslieferungszustand und es wurde noch kein Sicherheitsschlüssel gesetzt.",
"dialogSetSecKeyLoadBackupLblC" : "Sicherheitsschlüssel:",
"btnSysConfAdditionalSoftRemoveSuccess" : " wurde erfolgreich ausgef%FChrt.",
- "btnSysConfAdditionalSoftRemoveFailure" : " fehlgeschlagen:\n",
+ "btnSysConfAdditionalSoftRemoveFailure" : " wurde mit Fehlern abgeschlossen:\n\n",
"dialogChooseLEDTitle" : "LEDs ausw%E4hlen",
"infoStatusControlLblDanger" : "Gefahr",
"actionStatusControlUp" : "Auf",
--- occu/WebUI/www/webui/js/lang/en/translate.lang.extension.js.orig
+++ occu/WebUI/www/webui/js/lang/en/translate.lang.extension.js
@@ -326,7 +326,7 @@
"dialogSetSecKeyLoadBackuplblB" : "The CCU is in delivery status and a security key has not yet been set.",
"dialogSetSecKeyLoadBackupLblC" : "Security key:",
"btnSysConfAdditionalSoftRemoveSuccess" : " was successfully executed.",
- "btnSysConfAdditionalSoftRemoveFailure" : " failed:\n",
+ "btnSysConfAdditionalSoftRemoveFailure" : " was executed with failures:\n\n",
"dialogChooseLEDTitle" : "Select LEDs",
"infoStatusControlLblDanger" : "Hazard",
"actionStatusControlUp" : "Up",