From fadca6e8c52e1a37f704fee0c23d15a1b786d8a9 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Wed, 28 Dec 2016 08:38:07 +0000 Subject: [PATCH] release 1.3.4-10 git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3447 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 8 ++++---- webif/lib/bin/auto | 5 +++++ webif/lib/pkg.class | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index f5d7bfb..fd43cc2 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.4-9 +Version: 1.3.4-10 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),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),sqlite3(>=3.15.1) +Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),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.5),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),sqlite3(>=3.15.1) Suggests: -Description: An evolving web interface for the Humax (beta). -Tags: http://hummy.tv/forum/threads/7514/ +Description: An evolving web interface for the Humax. +Tags: http://hummy.tv/forum/threads/7619/ diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto index 0390202..45a2b86 100755 --- a/webif/lib/bin/auto +++ b/webif/lib/bin/auto @@ -151,6 +151,11 @@ proc dsc {{size 0}} { # Determine if it's time to run +if {[system uptime] < 180} { + log "Aborting, system has just booted." 2 + exit +} + dsc oktorun if {!$manualrun} { diff --git a/webif/lib/pkg.class b/webif/lib/pkg.class index eb520bd..59dbe99 100755 --- a/webif/lib/pkg.class +++ b/webif/lib/pkg.class @@ -16,12 +16,16 @@ set ::diagmeta {} pkg method _load {nm} { set name $nm + set latest 0 foreach line [split [exec /bin/opkg list $nm] "\n"] { # betaftpd - 0.0.8pre17-1 - Description... if {[string match { *} $line]} { append descr $line } else { - regexp {^[^ ]+ - ([^ ]+) - (.*)$} $line x latest descr + regexp {^[^ ]+ - ([^ ]+) - (.*)$} $line x xlatest descr + if {[pkg vercompare $xlatest $latest] > 0} { + set latest $xlatest + } } } regexp {(.*) \[(.*)\]} $descr x descr changes