From 7bff8aa350f5dfdef872051f586b45010e231612 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Mar 2015 12:57:49 +0100 Subject: [PATCH] tests/update_repolock: fix repo order and use readlink -f to fix travis-ci. --- tests/xbps/libxbps/shell/update_repolock.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/xbps/libxbps/shell/update_repolock.sh b/tests/xbps/libxbps/shell/update_repolock.sh index c5640ddf..ea3c6721 100644 --- a/tests/xbps/libxbps/shell/update_repolock.sh +++ b/tests/xbps/libxbps/shell/update_repolock.sh @@ -20,15 +20,15 @@ update_repolock_body() { atf_check_equal $? 0 cd .. # install A-1.0_1 from repository "repo" - xbps-install -r root --repository=repo --repository=repo2 -yvd A-1.0_1 + xbps-install -r root --repository=repo2 --repository=repo -yvd A-1.0_1 atf_check_equal $? 0 # A-1.0_1 is now locked xbps-pkgdb -r root -m repolock A atf_check_equal $? 0 out=$(xbps-query -r root -p repository A) - atf_check_equal "$out" "$(realpath repo)" + atf_check_equal "$out" "$(readlink -f repo)" # no update due to repository locking - xbps-install -r root --repository=repo --repository=repo2 -yuvd + xbps-install -r root --repository=repo2 --repository=repo -yuvd atf_check_equal $? 0 out=$(xbps-query -r root -p pkgver A) atf_check_equal $out A-1.0_1 @@ -43,7 +43,7 @@ update_repolock_body() { out=$(xbps-query -r root -p pkgver A) atf_check_equal $out A-1.1_1 out=$(xbps-query -r root -p repository A) - atf_check_equal "$out" "$(realpath repo2)" + atf_check_equal "$out" "$(readlink -f repo2)" } atf_init_test_cases() {