diff options
| author | onefang | 2019-12-25 23:11:53 +1000 |
|---|---|---|
| committer | onefang | 2019-12-25 23:11:53 +1000 |
| commit | 14881493390cb2b41ea2b04c4be478dfd373f2d3 (patch) | |
| tree | 5078fb33bc5d8cbb212a0237b38dfd86a2b0692c /apt-panopticon.lua | |
| parent | TODO++ (diff) | |
| download | apt-panopticon-14881493390cb2b41ea2b04c4be478dfd373f2d3.zip apt-panopticon-14881493390cb2b41ea2b04c4be478dfd373f2d3.tar.gz apt-panopticon-14881493390cb2b41ea2b04c4be478dfd373f2d3.tar.bz2 apt-panopticon-14881493390cb2b41ea2b04c4be478dfd373f2d3.tar.xz | |
Don't log some APT.execute() calls.
Diffstat (limited to '')
| -rwxr-xr-x | apt-panopticon.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-panopticon.lua b/apt-panopticon.lua index 72ac6ae..5493683 100755 --- a/apt-panopticon.lua +++ b/apt-panopticon.lua | |||
| @@ -486,8 +486,8 @@ local postDownload = function(host, r, k) | |||
| 486 | " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. ".old" .. | 486 | " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. ".old" .. |
| 487 | " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. "; fi") | 487 | " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. "; fi") |
| 488 | if APT.checkFile('results/' .. host .. '/merged/dists/' .. r .. '/' .. k) then | 488 | if APT.checkFile('results/' .. host .. '/merged/dists/' .. r .. '/' .. k) then |
| 489 | if ".gz" == k:sub(-3, -1) then APT.execute("ionice -c3 nice -n 19 gzip -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k) end | 489 | if ".gz" == k:sub(-3, -1) then APT.execute("ionice -c3 nice -n 19 gzip -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k, false) end |
| 490 | if ".xz" == k:sub(-3, -1) then APT.execute("ionice -c3 nice -n 19 xz -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. " 2>/dev/null") end | 490 | if ".xz" == k:sub(-3, -1) then APT.execute("ionice -c3 nice -n 19 xz -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. " 2>/dev/null", false) end |
| 491 | end | 491 | end |
| 492 | end | 492 | end |
| 493 | 493 | ||
| @@ -632,7 +632,7 @@ local parseDebs = function(host) | |||
| 632 | local v, p, sz, sha = l:match(' | (.+) | (pool/.+%.deb) | (%d.+) | (%x.+) |') | 632 | local v, p, sz, sha = l:match(' | (.+) | (pool/.+%.deb) | (%d.+) | (%x.+) |') |
| 633 | if nil ~= p then | 633 | if nil ~= p then |
| 634 | if APT.checkFile('results/' .. host .. "/merged/" .. p) then | 634 | if APT.checkFile('results/' .. host .. "/merged/" .. p) then |
| 635 | local status, fsz = APT.execute('ls -l results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 5-5') | 635 | local status, fsz = APT.execute('ls -l results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 5-5', false) |
| 636 | if APT.testing("Integrity") then | 636 | if APT.testing("Integrity") then |
| 637 | if sz ~= fsz:sub(2, -2) then -- The sub bit is to slice off the EOLs at each end. | 637 | if sz ~= fsz:sub(2, -2) then -- The sub bit is to slice off the EOLs at each end. |
| 638 | E('Package size mismatch - results/' .. host .. "/merged/" .. p .. ' should be ' .. sz .. ', but is ' .. fsz:sub(2, -2) .. '.', 'http', 'Integrity', host) | 638 | E('Package size mismatch - results/' .. host .. "/merged/" .. p .. ' should be ' .. sz .. ', but is ' .. fsz:sub(2, -2) .. '.', 'http', 'Integrity', host) |