initSync(): fixed parameter naming
[util-vserver.git] / util-vserver / scripts / vserver-build.functions.rpm
index 3280f96..a479877 100644 (file)
@@ -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
@@ -45,7 +45,7 @@ function rpm.initVariables
        RPMDB_PATH=/.rpmdb || \
        RPMDB_PATH=/dev
 
-    findDir RPMLIBDIR "$CONFDIR/.distributions/$DISTRIBUTION/rpmlib" "$DISTRIBDIR/$DISTRIBUTION/rpmlib" /
+    findDir RPMLIBDIR "$__CONFDIR/.distributions/$DISTRIBUTION/rpmlib" "$__DISTRIBDIR/$DISTRIBUTION/rpmlib" /
 }
 
 function rpm.initFilesystem
@@ -60,9 +60,9 @@ function rpm.initFilesystem
 
     mkdir -p "$PKGCFGDIR"/rpm/{etc,state}
     populateDirectory "$PKGCFGDIR/rpm/etc" \
-       "$DISTRIBDIR/defaults/rpm" \
-       "$DISTRIBDIR/$DISTRIBUTION/rpm" \
-       "$CONFDIR/.distributions/$DISTRIBUTION/rpm"
+       "$__DISTRIBDIR/defaults/rpm" \
+       "$__DISTRIBDIR/$DISTRIBUTION/rpm" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/rpm"
 
     echo "%_dbpath $RPMDB_PATH" >>"$PKGCFGDIR/rpm/etc/macros"
 
@@ -105,15 +105,15 @@ function rpmlist.initByDistribution()
     declare -a _rlid_res=() 
     
 
-    findDir _rlid_listdir "$CONFDIR/.distributions/$2/rpmlist.d" \
-                         "$DISTRIBDIR/$2/rpmlist.d" \
+    findDir _rlid_listdir "$__CONFDIR/.distributions/$2/rpmlist.d" \
+                         "$__DISTRIBDIR/$2/rpmlist.d" \
                          ''
                    
     test -d "$_rlid_listdir" || return 0
 
     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=()