openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnetwork.lib.in,pck-update.in: disable repository reachability check and dependency on the 'host' tool

Browse Source
This commit is contained in:
Silvan Calarco 2023-07-22 15:21:37 +02:00
parent 0e6a1e8929
commit 33c9c564cf
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autospec.spec.in
View File

@ -20,10 +20,6 @@ Requires(pre): rpm
Requires: cpio, coreutils, curl, findutils, grep, sed Requires: cpio, coreutils, curl, findutils, grep, sed
Requires: /bin/mktemp Requires: /bin/mktemp
Requires: /usr/bin/getopt Requires: /usr/bin/getopt
%if "%{stage1}" != "1"
# host (and 'bind-utils') is not available in early stage platform development
Requires: /usr/bin/host
%endif
Requires: bzip2 Requires: bzip2
Requires: gzip Requires: gzip
Requires: unzip Requires: unzip

19
lib/libnetwork.lib.in
View File

@ -23,29 +23,10 @@ libnetwork.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
notify.debug $"loading"": \`libnetwork.lib'..." notify.debug $"loading"": \`libnetwork.lib'..."
# check if all the needed tools are available # check if all the needed tools are available
# note: 'host' has been removed from this list because the package
# bind-utils is not available in early stage platform development
for tool in curl mktemp; do for tool in curl mktemp; do
[ "$(type -p curl)" ] || notify.error $"utility not found"": \`curl'" [ "$(type -p curl)" ] || notify.error $"utility not found"": \`curl'"
done done
# function repository.is_reachable()
# check if the server '$1' is reachable (test = DNS lookup query)
# args:
# $1 : server name
function repository.is_reachable() {
local ftpserver="${1/[a-z]*\:\/\//}"
[ "$ftpserver" ] || notify.error $"\
(bug)"" -- $FUNCNAME: "$"missing mandatory arg"" (#1)"
if [ "$(type -p host)" ]; then
host -W3 $ftpserver >&/dev/null
else
notify.warning $"utility not found"": \`host'"
fi
return $?
}
# function repository.get_srpm_pckname_from_site() # function repository.get_srpm_pckname_from_site()
# get the list of SRPM packages by looking at the curl dump of the # get the list of SRPM packages by looking at the curl dump of the
# ftp or html site # ftp or html site

8
plugins/pck-update.in
View File

@ -2714,13 +2714,7 @@ ftp_server_upload_num = \"$ftp_server_upload_num\" (was unset)"
notify.debug "\ notify.debug "\
ftp_server_upload_num = \"$ftp_server_upload_num\"" ftp_server_upload_num = \"$ftp_server_upload_num\""
if [ "${ftp_rw_server[$ftp_server_upload_num]}" ]; then if [ ! "${ftp_rw_server[$ftp_server_upload_num]}" ]; then
repository.is_reachable "${ftp_rw_server[$ftp_server_upload_num]}"
# NOTE. notify.error --> notify.warning because host command fails
# in qemu-arm environment (1.4.18)
[ $? -eq 0 ] || notify.warning $"\
server unreachable"": \`${ftp_rw_server[$ftp_server_upload_num]}'"
else
notify.error $"\ notify.error $"\
you have no read write access to url#$ftp_server_upload_num" you have no read write access to url#$ftp_server_upload_num"
break break