X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Ffunctions;h=2eac61f94e6e53312c165cd3ad13023a6db4ce47;hb=f64dbf290eb891ebee9b40eabd5240d15a873568;hp=8fc1929c41e4c9337514ee4f901c059fa2a0e995;hpb=75ec49a1bd83dff7fc68b50b6b37106cdf066e01;p=util-vserver.git diff --git a/scripts/functions b/scripts/functions index 8fc1929..2eac61f 100644 --- a/scripts/functions +++ b/scripts/functions @@ -91,7 +91,7 @@ function isDirectoryEmpty shopt -s nullglob || * ignore_lostfound=1 - test -z "$2" -o "$2" = 0 || ignore_lostfound= + test -n "$2" -a "$2" != 0 || ignore_lostfound= for i in "$1"/*; do case "$i" in @@ -429,7 +429,7 @@ function _pkgMountYum function _pkgMountUrpmi { - : + _pkgMountBindDir "$RPMSTATEDIR" "$URPMISTATEDIR/../../../.rpmdb" } function _pkgMountRPM @@ -926,7 +926,7 @@ function pkgmgmt.isUrpmiAvailable local have_urpmi i if test -n "$is_internal"; then have_urpmi=1 - test -d "$cfgdir"/var/lib/urpmi || have_urpmi= + test -d "$cfgdir"/base/var/lib/urpmi || have_urpmi= else have_urpmi= for i in /bin /usr/bin /usr/local/bin; do