Skip to content

Handle the scenario where $VARLIB is a symlink #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmoll merged 2 commits into from
Mar 29, 2016
Merged

Handle the scenario where $VARLIB is a symlink #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
010754c
Handle the scenario where $VARLIB is a symlink
cure Jan 28, 2016
8b2b575
Add tests for VARLIB being a symlink
domcleal Mar 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/freight-cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ cd "$VARLIB"
if [ -z "$*" ]
then
DIRS="$(
find "$VARLIB" -mindepth 2 -maxdepth 2 -type d -printf "%P\n" |
find "$VARLIB"/ -mindepth 2 -maxdepth 2 -type d -printf "%P\n" |
grep -v "^\\." |
tr "\n" " "
)"
Expand All @@ -100,7 +100,7 @@ do

# Parse the manager and distro out of the Freight library path.
DIR="$(readlink -f "$DIR")"
DIR="${DIR##"$VARLIB/"}"
DIR="${DIR##"$(readlink -f "$VARLIB")/"}"
MANAGER="$(dirname "$DIR")"
DIST="$(basename "$DIR")"

Expand Down
7 changes: 7 additions & 0 deletions test/apt_add.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,10 @@ setup() {
assert_output "# [freight] added ${FIXTURES}/source_1.0.orig.tar.gz to apt/example"
test -e ${FREIGHT_LIB}/apt/example/source_1.0.orig.tar.gz
}

@test "freight-add handles VARLIB being a symlink" {
mv $FREIGHT_LIB ${FREIGHT_LIB}_real
ln -s ${FREIGHT_LIB}_real $FREIGHT_LIB
freight_add ${FIXTURES}/test_1.0_all.deb apt/example/comp
test -e ${FREIGHT_LIB}_real/apt/example/comp/test_1.0_all.deb
}
8 changes: 8 additions & 0 deletions test/apt_cache.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,11 @@ setup() {
assert_output ""
test -e ${FREIGHT_CACHE}/pool/example/main/t/test/test_1.0_all.deb
}

@test "freight-cache handles VARLIB being a symlink" {
mv $FREIGHT_LIB ${FREIGHT_LIB}_real
ln -s ${FREIGHT_LIB}_real $FREIGHT_LIB
freight_cache
test -e ${FREIGHT_CACHE}/pool/example/comp/t/test/test_1.0_all.deb
test -e ${FREIGHT_CACHE}/pool/example/main/t/test/test_1.0_all.deb
}