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

kiss: Possible fix for conflict bug

Browse Source
This commit is contained in:
Dylan Araps 2019-11-21 00:45:52 +00:00
parent 3251871043
commit f4ea3cf382
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kiss
View File

@ -575,27 +575,27 @@ pkg_conflicts() {
set +ef
# Extract manifest from tarball and only print files which
# exist in the filesystem. It's pointless to check for conflicts
# with files which don't presently exist.
# Filter the tarball's manifest and select only files
# and any files they resolve to on the filesystem \
# (/bin/ls -> /usr/bin/ls).
tar xf "$1" -O "./$pkg_db/$2/manifest" | while read -r file; do
[ -f "$KISS_ROOT/$file" ] && {
printf '%s\n' "$file"
case $file in */) continue; esac
(cd "$KISS_ROOT/"; readlink -f "./$file")
}
printf '%s\n' "$file"
(cd "$KISS_ROOT/" && readlink -f "./$file") ||:
done |
# Filter the existing file list through the manifest of the
# presently installed version of the package (if it exists).
grep -svFxf "$sys_db/$2/manifest" - 2>/dev/null > "$cac_dir/$pid-m"
grep -svFxf "$KISS_ROOT/$sys_db/$2/manifest" - \
2>/dev/null > "$cac_dir/$pid-m"
# If the generated manifest contains matches, check the
# contents for conflicts.
if [ -s "$cac_dir/$pid-m" ]; then
[ -s "$cac_dir/$pid-m" ] &&
grep -Fxf "$cac_dir/$pid-m" -- "$sys_db"/*/manifest &&
die "Package '$2' conflicts with another package"
fi
set -ef
}