diff options
-rw-r--r-- | apt-panopticommon.lua | 3 | ||||
-rwxr-xr-x | apt-panopticon.lua | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua index ffc3af4..dddcc9c 100644 --- a/apt-panopticommon.lua +++ b/apt-panopticommon.lua | |||
@@ -698,8 +698,7 @@ end | |||
698 | 698 | ||
699 | APT.now = 0 | 699 | APT.now = 0 |
700 | local status | 700 | local status |
701 | APT.now = APT.exe('TZ="GMT" ls -l --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result | 701 | APT.now = tonumber(APT.exe('TZ="GMT" ls -l --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result) |
702 | APT.now = tonumber(APT.now) | ||
703 | local start = 'now-1month' | 702 | local start = 'now-1month' |
704 | local step = '10min' | 703 | local step = '10min' |
705 | local hb = '150min' | 704 | local hb = '150min' |
diff --git a/apt-panopticon.lua b/apt-panopticon.lua index e9b1015..5797f91 100755 --- a/apt-panopticon.lua +++ b/apt-panopticon.lua | |||
@@ -853,10 +853,8 @@ local parseRelease = function(host) | |||
853 | coroutine.yield() | 853 | coroutine.yield() |
854 | D('*>* Resumed coroutine while waiting on - not APT.checkFile(results_old/' .. fRp .. ')') | 854 | D('*>* Resumed coroutine while waiting on - not APT.checkFile(results_old/' .. fRp .. ')') |
855 | end | 855 | end |
856 | local pkt = APT.exe([[TZ="GMT" date -d "$(grep '^Date:' results/]] .. fRp .. [[ | cut -d ' ' -f 2-)" '+%s']]):Do().result | 856 | local pkt = tonumber(APT.exe([[TZ="GMT" date -d "$(grep '^Date:' results/]] .. fRp .. [[ | cut -d ' ' -f 2-)" '+%s']]):Do().result:sub(2, -2)) |
857 | pkt = tonumber(pkt:sub(2, -2)) | 857 | local new = tonumber(APT.exe([[TZ="GMT" date -d "$(grep '^Date:' ]] .. fR .. [[.SORTED | cut -d ' ' -f 2-)" '+%s']]):Do().result:sub(2, -2)) |
858 | local new = APT.exe([[TZ="GMT" date -d "$(grep '^Date:' ]] .. fR .. [[.SORTED | cut -d ' ' -f 2-)" '+%s']]):Do().result | ||
859 | new = tonumber(new:sub(2, -2)) | ||
860 | local upd = pkt + APT.mirrors[host].Updated | 858 | local upd = pkt + APT.mirrors[host].Updated |
861 | local updd = pkt + (APT.mirrors[host].Updated * 1.5) -- Give the mirror time to actually do the update. | 859 | local updd = pkt + (APT.mirrors[host].Updated * 1.5) -- Give the mirror time to actually do the update. |
862 | if pkt > new then | 860 | if pkt > new then |