hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

fix startop -multiple

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3343 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-11-15 22:50:22 +00:00
parent 7edf787c28
commit 7b7651b5f8
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: webif
Priority: optional
Section: web
Version: 1.3.2-15
Version: 1.3.2-16
Architecture: mipsel
Maintainer: af123@hpkg.tv
Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95)

2
webif/cgi-bin/status.jim
View File

@ -145,7 +145,7 @@ foreach opfile [glob -nocomplain -directory /tmp -tails -- ".bgop.*"] {
# Check that the lock is still held
if {![system checkop $op]} {
debug "$op/$file/$oppid - process not found."
debug "$op - $file - $oppid - process not found."
file delete "/tmp/$opfile"
} else {
set ops($file) $op

11
webif/lib/system.class
View File

@ -743,10 +743,11 @@ proc {system has} {comp} {
return 0
}
set ::system::ops {}
# Note that {system checkop} can be called from processes other than that
# which started the operation. Hence no visilibty into the ::system::ops
# dictionary.
proc {system checkop} {op} {
if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 }
if {![regexp -nocase -- {^[.a-z0-9]+$} $op]} { return 0 }
if {[catch {set fp [open "/tmp/.bgop.$op" "a"]}]} {
return 0
}
@ -759,6 +760,8 @@ proc {system checkop} {op} {
return $ret
}
set ::system::ops {}
proc {system startop} {args op file} {
if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 }
if {"-multiple" in $args} {
@ -784,7 +787,7 @@ proc {system startop} {args op file} {
}
proc {system endop} {op} {
if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 }
if {![regexp -nocase -- {^[.a-z0-9]+$} $op]} { return 0 }
if {[dict exists $::system::ops $op]} {
catch {
set fp $::system::ops($op)