bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: resolve symlinks in package conflict check.

Browse Source
This commit is contained in:
Dylan Araps 2019-11-20 14:26:08 +00:00
parent 4d3d6db8af
commit 3251871043
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kiss
View File

@ -579,7 +579,11 @@ pkg_conflicts() {
# exist in the filesystem. It's pointless to check for conflicts # exist in the filesystem. It's pointless to check for conflicts
# with files which don't presently exist. # with files which don't presently exist.
tar xf "$1" -O "./$pkg_db/$2/manifest" | while read -r file; do tar xf "$1" -O "./$pkg_db/$2/manifest" | while read -r file; do
[ -f "$KISS_ROOT/$file" ] && printf '%s\n' "$file" [ -f "$KISS_ROOT/$file" ] && {
printf '%s\n' "$file"
(cd "$KISS_ROOT/"; readlink -f "./$file")
}
done | done |
# Filter the existing file list through the manifest of the # Filter the existing file list through the manifest of the
@ -588,9 +592,10 @@ pkg_conflicts() {
# If the generated manifest contains matches, check the # If the generated manifest contains matches, check the
# contents for conflicts. # contents for conflicts.
[ -s "$cac_dir/$pid-m" ] && if [ -s "$cac_dir/$pid-m" ]; then
grep -Fxf "$cac_dir/$pid-m" -- "$sys_db"/*/manifest && grep -Fxf "$cac_dir/$pid-m" -- "$sys_db"/*/manifest &&
die "Package '$2' conflicts with another package" die "Package '$2' conflicts with another package"
fi
set -ef set -ef
} }