diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-29 12:54:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-29 12:54:52 +0000 |
| commit | a5caab30c9cc5ea5209f5394f456d9f9b42717a6 (patch) | |
| tree | 2e2a0a9db24eb44af1ac18c28c874a396382477a /abuild.in | |
| parent | b7c197f20c6a26a99e64c237ecfef173f4096ec3 (diff) | |
| download | abuild-a5caab30c9cc5ea5209f5394f456d9f9b42717a6.tar.gz abuild-a5caab30c9cc5ea5209f5394f456d9f9b42717a6.tar.bz2 abuild-a5caab30c9cc5ea5209f5394f456d9f9b42717a6.tar.xz abuild-a5caab30c9cc5ea5209f5394f456d9f9b42717a6.zip | |
abuild: improve error message when conflicting packages are installed
Diffstat (limited to 'abuild.in')
| -rw-r--r-- | abuild.in | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1558,15 +1558,15 @@ builddeps() { # find which deps are missing for i in $builddeps; do - if [ "${i#\!}" != "$i" ]; then - $APK info --quiet --installed "${i#\!}" + if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then + error "Conflicting package installed: ${i#\!}" elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then missing="$missing $i" fi done for i in $hostdeps; do - if [ "${i#\!}" != "$i" ]; then - $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}" + if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then + error "Conflicting package installed: ${i#\!}" elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then missing="$missing $i" fi |