~alpine/devel

Removed conflicts= support v1 PROPOSED

Łukasz Jendrysik <scadu@yandex.com>
9 years ago 
Łukasz Jendrysik: 1
 Removed conflicts= support

 1 files changed, 3 insertions(+), 13 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git: 

curl -s https://lists.alpinelinux.org/~alpine/devel/patches/218/mbox | git am -3
Learn more about email & git
Reply to thread View this thread in the archives

[alpine-devel] [PATCH] Removed conflicts= support Export this patch

Łukasz Jendrysik <scadu@yandex.com>
9 years ago 
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
---