For discussion of Alpine Linux development and developer support

1

[alpine-devel] [PATCH] Removed conflicts= support

Łukasz Jendrysik
Details
Message ID
<1419622982-1451-1-git-send-email-scadu@yandex.com>
Sender timestamp
1419622982
DKIM signature
missing
Download raw message
Patch: +3 -13
Conflicts support in an abuild seems to be uneccessary feature.

Signed-off-by: Łukasz Jendrysik <scadu@yandex.com>
---
 abuild.in | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/abuild.in b/abuild.in
index 5459a9b..988d1fb 100644
--- a/abuild.in
+++ b/abuild.in
@@ -825,9 +825,6 @@ EOF
 	for i in $deps; do
 		echo "depend = $i" >> "$pkginfo"
 	done
-	for i in $conflicts; do
-		echo "conflict = $i" >> "$pkginfo"
-	done
 	for i in $provides; do
 		echo "provides = $i" >> "$pkginfo"
 	done
@@ -1532,7 +1529,7 @@ deptrace() {
 
 # build and install dependencies
 builddeps() {
-	local pkg= i= missing= conflicts=
+	local pkg= i= missing=
 	local hostdeps= builddeps= installed_hostdeps= installed_builddeps=
 	[ -n "$nodeps" ] && return 0
 	msg "Analyzing dependencies..."
@@ -1563,26 +1560,19 @@ builddeps() {
 	# find which deps are missing
 	for i in $builddeps; do
 		if [ "${i#\!}" != "$i" ]; then
-			$APK info --quiet --installed "${i#\!}" \
-				&& conflicts="$conflicts ${i#\!}"
+			$APK info --quiet --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#\!}" \
-				&& conflicts="$conflicts ${i#\!}"
+			$APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"
 		elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
 			missing="$missing $i"
 		fi
 	done
 
-	if [ -n "$conflicts" ]; then
-		error "Conflicting package(s) installed:$conflicts"
-		return 1
-	fi
-
 	if [ -z "$install_deps" ] && [ -z "$recursive" ]; then
 		# if we dont have any missing deps we are done now
 		[ -z "$missing" ] && return 0
-- 
2.2.1



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20141229135742.6a609824@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1419622982-1451-1-git-send-email-scadu@yandex.com> (view parent)
Sender timestamp
1419857862
DKIM signature
missing
Download raw message
On Fri, 26 Dec 2014 20:43:02 +0100
*ukasz Jendrysik <scadu@yandex.com> wrote:

> Conflicts support in an abuild seems to be uneccessary feature.

Looks like you are right.

Applied.

I also added the error message afterwards to make it more visible why
abuild halts when conflicting packages are installed.


Thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---