From 52939392bacced7c1826d93295f996326c923c06 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 27 Jan 2013 21:23:16 +0000 Subject: [PATCH] stop auto recursion into bin git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1373 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/lib/bin/auto | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index dc60654..2e2baee 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.11.0-1 +Version: 0.11.0-2 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.0.4-1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.6),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.9-1),hmt(>=1.1.10),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05) diff --git a/var/mongoose/lib/bin/auto b/var/mongoose/lib/bin/auto index 54e7846..57e8065 100755 --- a/var/mongoose/lib/bin/auto +++ b/var/mongoose/lib/bin/auto @@ -8,7 +8,7 @@ set testing 0 proc dsc {} { lassign [system diskspace] x x perc if {$perc > 90} { - puts "Insufficient disk space, terminating." + puts "Insufficient disk space ($perc%), terminating." exit } } @@ -242,11 +242,17 @@ proc mpg {dir} { } proc scan {dir attr {force 0}} {{indent 0}} { + global dustbin + incr indent 2 if {$::testing} { puts "[string repeat " " $indent]\[$dir]" } - if {[string match {\[*} $dir]} continue + #if {[string match {\[*} $dir]} continue + if {$dir eq $::dustbin} { + puts "Dustbin, skipping." + return + } dsc