From 42f83f10409db55ba66d896435c73ee3fec3f584 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Wed, 30 Sep 2015 18:30:16 +0000 Subject: [PATCH] commit git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2473 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/lib/browse.class | 4 ++-- webif/lib/system.class | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index c41c7b0..d8df946 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.2.4-7 +Version: 1.2.4-8 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.7),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7) diff --git a/webif/lib/browse.class b/webif/lib/browse.class index f356cab..16180f2 100644 --- a/webif/lib/browse.class +++ b/webif/lib/browse.class @@ -116,7 +116,7 @@ proc {ts iconset} {ts} { set locked 0 if {[$ts flag "Locked"] > 0} { set locked 1 - lappend icons [_addicon "/images/178_1_00_Icon_Lock.png" + lappend icons [_addicon "/images/178_1_00_Icon_Lock.png" \ "Locked"] } lappend attrs "locked=$locked" @@ -125,7 +125,7 @@ proc {ts iconset} {ts} { set encd 0 if {[$ts flag "Encrypted"] > 0} { set encd 1 - lappend icons [_addicon "/images/749_1_26_Video_Encryption.png" + lappend icons [_addicon "/images/749_1_26_Video_Encryption.png"\ ""] } lappend attrs "encd=$encd" diff --git a/webif/lib/system.class b/webif/lib/system.class index 839db4c..98d91ab 100644 --- a/webif/lib/system.class +++ b/webif/lib/system.class @@ -364,12 +364,13 @@ proc {system busy} {} { } proc {system inuse} {file} { + if {![file exists $file]} { return 0 } set op [exec /mod/webif/lib/bin/lsof -X -Fn $file] - if {$op eq ""} { - return 0 - } else { - return 1 + switch -glob -- $op { + "" - + "*status error*" { return 0 } } + return 1 } proc {system dirinuse} {dir} {