aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2020-07-17 02:51:41 +1000
committeronefang2020-07-17 02:51:41 +1000
commit94472fd38ec7bdfa7d4495959fb5695e269832fd (patch)
treeb5fb45daf00c5db9902ad612cda4cf4cd949f3a2
parentNo DNS-RR reports for IPv6 addreses if IPv6 is disabled. (diff)
downloadapt-panopticon-94472fd38ec7bdfa7d4495959fb5695e269832fd.zip
apt-panopticon-94472fd38ec7bdfa7d4495959fb5695e269832fd.tar.gz
apt-panopticon-94472fd38ec7bdfa7d4495959fb5695e269832fd.tar.bz2
apt-panopticon-94472fd38ec7bdfa7d4495959fb5695e269832fd.tar.xz
Check for nil FDQN and BaseURL.
Should move that up higher. Something else is going wrong.
-rwxr-xr-xapt-panopticon.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index b44843b..b0f0049 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -576,8 +576,12 @@ local validateURL = function(m)
576 local p = url.parse("http://" .. m.BaseURL) 576 local p = url.parse("http://" .. m.BaseURL)
577 if nil == p.path then p.path = '' end 577 if nil == p.path then p.path = '' end
578 if nil ~= p.port then p.authority = authority .. ':' .. p.port end 578 if nil ~= p.port then p.authority = authority .. ':' .. p.port end
579 if m.FQDN ~= p.authority then W("Something wrong in FDQN from mirror_list.txt! " .. m.FDQN, "", "", p.authority) end 579 if nil == m.FDQN then W("Something wrong in FDQN from mirror_list.txt! nil", "", "", p.authority) else
580 if m.BaseURL ~= (p.authority .. p.path) then W("Something wrong in BaseURL from mirror_list.txt! " .. m.BaseURL, "", "", p.authority) end 580 if m.FQDN ~= p.authority then W("Something wrong in FDQN from mirror_list.txt! " .. m.FDQN, "", "", p.authority) end
581 end
582 if nil == m.BaseURL then W("Something wrong in BaseURL from mirror_list.txt! nil", "", "", p.authority) else
583 if m.BaseURL ~= (p.authority .. p.path) then W("Something wrong in BaseURL from mirror_list.txt! " .. m.BaseURL, "", "", p.authority) end
584 end
581 if (nil ~= p.query) or (nil ~= p.fragment) or (nil ~= p.params) then W("Something wrong in BaseURL from mirror_list.txt, should be nothing after the path! " .. m.BaseURL, "", "", p.authority) end 585 if (nil ~= p.query) or (nil ~= p.fragment) or (nil ~= p.params) then W("Something wrong in BaseURL from mirror_list.txt, should be nothing after the path! " .. m.BaseURL, "", "", p.authority) end
582 if (nil ~= p.user) or (nil ~= p.userinfo) or (nil ~= p.password) then W("Something wrong in BaseURL from mirror_list.txt, should be no credentials! " .. m.BaseURL, "", "", p.authority) end 586 if (nil ~= p.user) or (nil ~= p.userinfo) or (nil ~= p.password) then W("Something wrong in BaseURL from mirror_list.txt, should be no credentials! " .. m.BaseURL, "", "", p.authority) end
583 m.FQDN = p.authority 587 m.FQDN = p.authority