X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions.rpm;h=f9204db17b068f250ee0907aaf1e6a642d34418c;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=d3a97958299d9f632d0caf00677593ba751c045b;hpb=bd0454a515b140c582ce860e1ca218f4569c3287;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.rpm b/util-vserver/scripts/vserver-build.functions.rpm index d3a9795..f9204db 100644 --- a/util-vserver/scripts/vserver-build.functions.rpm +++ b/util-vserver/scripts/vserver-build.functions.rpm @@ -29,7 +29,7 @@ function rpm.importGPGPubKeys for i; do local file= for file in "$i"/*; do - test -f "$file" || continue + isRegularFile "$file" || continue pkgs=( "${pkgs[@]}" "$file" ) done @@ -113,7 +113,7 @@ function rpmlist.initByDistribution() local _rlid_lst for _rlid_lst in "$_rlid_listdir"/*.lst; do - test -e "$_rlid_lst" || continue + isRegularFile "$_rlid_lst" || continue local _rlid_opts=${_rlid_lst%%lst}cmd declare -a _rlid_tmp=() @@ -124,3 +124,18 @@ function rpmlist.initByDistribution() eval "$1"='( "${_rlid_res[@]}" )' } + + +## Usage: rpm.sanityCheck +function rpm.sanityCheck +{ + test -x "$BUILD_INITPRE" || colorize warn warning $"\ +WARNING: you are going to use an rpm-based installation method without + having an 'initpre' script. Such a script is highly recommend to + workaround bugs in rpm which can cause messages like + + | error: unpacking of archive failed on file /usr/bin/X11;42dd8791: + + Please read http://linux-vserver.org/HowToRegisterNewDistributions + for information how to add support for your own distribution." +}