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

kiss: Fix conflict bug

Browse Source
This commit is contained in:
Dylan Araps 2020-10-05 09:23:30 +03:00
parent 751e7f3456
commit 950c575329
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiss
View File

@ -897,7 +897,7 @@ pkg_conflicts() {
printf '%s\n' "${PWD#"$KISS_ROOT"}/${file##*/}" printf '%s\n' "${PWD#"$KISS_ROOT"}/${file##*/}"
;; ;;
esac esac
done < "$tar_dir/$1/$pkg_db/$1/manifest" > "$tmp_dir/.manifest" done < "$tar_dir/$1/$pkg_db/$1/manifest" > "$tmp_dir/.conflict-manifest"
set +f set +f
set -f "$sys_db"/*/manifest set -f "$sys_db"/*/manifest
@ -916,7 +916,7 @@ pkg_conflicts() {
[ "$#" != 0 ] || return 0 [ "$#" != 0 ] || return 0
# Store the list of found conflicts in a file for reuse. # Store the list of found conflicts in a file for reuse.
grep -Fxf "$tmp_dir/.manifest" -- "$@" 2>/dev/null \ grep -Fxf "$tmp_dir/.conflict-manifest" -- "$@" 2>/dev/null \
> "$tmp_dir/.conflicts" ||: > "$tmp_dir/.conflicts" ||:
if [ "$KISS_CHOICE" != 0 ] && [ -s "$tmp_dir/.conflicts" ]; then if [ "$KISS_CHOICE" != 0 ] && [ -s "$tmp_dir/.conflicts" ]; then