From: Enrico Scholz Date: Sat, 16 Apr 2005 21:20:45 +0000 (+0000) Subject: use the common isRegularFile() method to filter out backup-files X-Git-Tag: version_0_30_210~251 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cef7c637657a3a83386a429f2eae391edc57fa36;p=util-vserver.git use the common isRegularFile() method to filter out backup-files git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2030 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver-build.functions b/util-vserver/scripts/vserver-build.functions index 884e14d..c2e7f74 100644 --- a/util-vserver/scripts/vserver-build.functions +++ b/util-vserver/scripts/vserver-build.functions @@ -55,12 +55,7 @@ function populateDirectory local file= for file in "$i"/*; do - test -e "$file" || continue - case "$file" in - (*/CVS) test ! -d "$file" || continue;; - (*.rpmsave|*.rpmnew|*.rpmorig) - continue;; - esac + isRegularFile "$file" || continue cp -a "$file" "$dst/" done diff --git a/util-vserver/scripts/vserver-build.functions.apt b/util-vserver/scripts/vserver-build.functions.apt index eee55ed..328a699 100644 --- a/util-vserver/scripts/vserver-build.functions.apt +++ b/util-vserver/scripts/vserver-build.functions.apt @@ -22,7 +22,7 @@ function apt.installBasePackages test "$dir" != / || return 0 for filelist in "$dir"/*; do - test -f "$filelist" || continue + isRegularFile "$filelist" || continue local idx=0 local can_fail=false local flags= diff --git a/util-vserver/scripts/vserver-build.functions.rpm b/util-vserver/scripts/vserver-build.functions.rpm index d3a9795..a479877 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=() diff --git a/util-vserver/scripts/vserver-build.functions.yum b/util-vserver/scripts/vserver-build.functions.yum index db6db8f..1006687 100644 --- a/util-vserver/scripts/vserver-build.functions.yum +++ b/util-vserver/scripts/vserver-build.functions.yum @@ -22,7 +22,7 @@ function yum.installBasePackages test "$dir" != / || return 0 for filelist in "$dir"/*; do - test -f "$filelist" || continue + isRegularFile "$filelist" || continue local idx=0 local can_fail=false local flags= diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index cfa69f2..299193c 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -771,7 +771,9 @@ function execScriptlets local already_handled= for i in "$base/$flavor" "$base/$flavor.d"/*; do - test -f "$i" -a -r "$i" || continue + isRegularFile "$i" || continue + test -r "$i" || continue + already_handled=1 local start= test -x "$i" || start=_sourceWrap