aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-12-04 04:10:47 +1000
committeronefang2019-12-04 04:10:47 +1000
commitfc2fff7dbd318be1a2ec48bf4c629a05d79846e9 (patch)
treee7f6d88a82592e2fdb9fffe0dd9941fa8f869aa5
parentTry to keep the old results directories small and clean. (diff)
downloadapt-panopticon-fc2fff7dbd318be1a2ec48bf4c629a05d79846e9.zip
apt-panopticon-fc2fff7dbd318be1a2ec48bf4c629a05d79846e9.tar.gz
apt-panopticon-fc2fff7dbd318be1a2ec48bf4c629a05d79846e9.tar.bz2
apt-panopticon-fc2fff7dbd318be1a2ec48bf4c629a05d79846e9.tar.xz
Don't log some of the executes.
-rwxr-xr-xapt-panopticon.lua15
1 files changed, 7 insertions, 8 deletions
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index 7d263c7..7da7380 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -714,12 +714,12 @@ local postDownload = function(host, r, k)
714 Pp:close() 714 Pp:close()
715 os.execute('sort results/' .. host .. '/merged/dists/'.. r .. dir .. 'Packages.parsed >results/' .. host .. '/merged/dists/'.. r .. dir .. 'Packages_parsed-sorted') 715 os.execute('sort results/' .. host .. '/merged/dists/'.. r .. dir .. 'Packages.parsed >results/' .. host .. '/merged/dists/'.. r .. dir .. 'Packages_parsed-sorted')
716 if checkFile('results_old/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted') then 716 if checkFile('results_old/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted') then
717 execute('diff -U 0 results_old/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' .. 717 os.execute('diff -U 0 results_old/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' ..
718 'results/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' .. 718 'results/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' ..
719 ' | grep -E "^-" | grep -Ev "^\\+\\+\\+|^---" >>results/OLD_PACKAGES_' .. r .. '.txt') 719 ' | grep -E "^-" | grep -Ev "^\\+\\+\\+|^---" >>results/OLD_PACKAGES_' .. r .. '.txt')
720 execute('diff -U 0 results_old/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' .. 720 os.execute('diff -U 0 results_old/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' ..
721 'results/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' .. 721 'results/pkgmaster.devuan.org/merged/dists/' .. r .. dir .. 'Packages_parsed-sorted ' ..
722 ' | grep -E "^\\+" | grep -Ev "^\\+\\+\\+|^---" >>results/NEW_Packages_' .. r .. '.txt') 722 ' | grep -E "^\\+" | grep -Ev "^\\+\\+\\+|^---" >>results/NEW_Packages_' .. r .. '.txt')
723 -- Find the smallest new package for each release. 723 -- Find the smallest new package for each release.
724 os.execute('sort -b -k 9,9 -n results/NEW_Packages_' .. r .. '.txt >results/NEW_Packages_' .. r .. '.sorted.txt') 724 os.execute('sort -b -k 9,9 -n results/NEW_Packages_' .. r .. '.txt >results/NEW_Packages_' .. r .. '.sorted.txt')
725 os.execute('grep -s " | pool/DEBIAN/" results/NEW_Packages_' .. r .. '.sorted.txt 2>/dev/null | head -n 1 >results/NEW_Packages_' .. r .. '.test.txt') 725 os.execute('grep -s " | pool/DEBIAN/" results/NEW_Packages_' .. r .. '.sorted.txt 2>/dev/null | head -n 1 >results/NEW_Packages_' .. r .. '.test.txt')
@@ -973,11 +973,10 @@ if 0 < #arg then
973 973
974 os.execute('sort -k 3 results/' .. pu.host .. '/merged/dists/' .. n .. '/Release >results/' .. pu.host .. '/merged/dists/' .. n .. '/Release.SORTED') 974 os.execute('sort -k 3 results/' .. pu.host .. '/merged/dists/' .. n .. '/Release >results/' .. pu.host .. '/merged/dists/' .. n .. '/Release.SORTED')
975 if options.referenceSite.value == pu.host then 975 if options.referenceSite.value == pu.host then
976 execute('diff -U 0 results_old/pkgmaster.devuan.org/merged/dists/' .. n .. '/Release.SORTED ' .. 976 os.execute('diff -U 0 results_old/pkgmaster.devuan.org/merged/dists/' .. n .. '/Release.SORTED ' ..
977 'results/pkgmaster.devuan.org/merged/dists/' .. n .. '/Release.SORTED ' .. 977 'results/pkgmaster.devuan.org/merged/dists/' .. n .. '/Release.SORTED ' ..
978 '| grep -v "@@" | grep "^+" | grep "Packages.xz$" | cut -c 77- >results/NEW_Release_' .. n .. '.txt') 978 '| grep -v "@@" | grep "^+" | grep "Packages.xz$" | cut -c 77- >results/NEW_Release_' .. n .. '.txt')
979 os.execute('rm results/' .. pu.host .. '/merged/dists/' .. n .. '/Release') 979 os.execute('rm results/' .. pu.host .. '/merged/dists/' .. n .. '/Release')
980-- os.execute('rm results/' .. pu.host .. '/merged/dists/' .. n .. '/Release.SORTED')
981-- TODO - Maybe check the date in Release, though since they are updated daily, is there any point? Perhaps it's for checking amprolla got run? 980-- TODO - Maybe check the date in Release, though since they are updated daily, is there any point? Perhaps it's for checking amprolla got run?
982 else 981 else
983-- TODO - compare to the pkgmaster copy. 982-- TODO - compare to the pkgmaster copy.