diff --git a/ChangeLog b/ChangeLog index a20b091..8aac444 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ Wed Apr 18 2012 Davide Madrisan * spec-create - Davide Madrisan: Exist with error when git is required but cannot be found. ++ bugfix + * pck-update, lib/libnetwork.lib - Davide Madrisan: + `host' is not required by pck-update; move the requirement to libnetwork. + ------------------------------------------------------------------------------- Changes in version 1.9.4 diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in index 752a955..1e5a635 100644 --- a/lib/libnetwork.lib.in +++ b/lib/libnetwork.lib.in @@ -18,6 +18,11 @@ if [[ -z "$LANG" && -r /etc/sysconfig/i18n ]]; then fi TEXTDOMAIN="libnetwork"; export TEXTDOMAIN +# check if all the needed tools are available +for tool in curl host mktemp; do + [ "$(type -p curl)" ] || notify.error $"utility not found"": \`curl'" +done + # function repository.is_reachable() # check if the server '$1' is reachable (test = DNS lookup query) # args: @@ -525,8 +530,6 @@ function curl.download() { notify.note $"downloading"" ${NOTE}$file_name${NORM} ..." - [ "$(type -p curl)" ] || notify.error $"utility not found"": \`curl'" - [ -d "$destdir" ] || if [ "$exitonerror" = 1 ]; then notify.warning $"\ diff --git a/plugins/pck-update.in b/plugins/pck-update.in index df523d6..98deb8b 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -309,7 +309,7 @@ fi [ "$logging_dir" ] || logging_dir="${tmppath_dir:-/var/tmp}/@package@" # check if all the needed tools are available -for tool in cat chmod cpio date file find fold ftp getopt grep host \ +for tool in cat chmod cpio date file find fold ftp getopt grep \ mktemp objdump readlink rpm rpmbuild rpm2cpio sed seq sort strings; do [ "$(type -p $tool)" ] || notify.error $"utility not found"": \`$tool'"