Attachment 193549 Details for Bug 227882 – Move match_flavor() to before its first use

[patch] Move match_flavor() to before its first use

pm-match-flavor-moved.diff (text/plain), 1.25 KB, created by Stefan Eßer on 2018-05-20 07:48:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Eßer

Created: 2018-05-20 07:48:40 UTC

Size: 1.25 KB

patch

obsolete

>--- portmaster~	2018-05-18 19:00:27.774488000 +0200
>+++ portmaster	2018-05-20 09:32:01.169655000 +0200
>@@ -561,6 +561,27 @@
> 	return 1
> }
> 
>+match_flavor () {
>+	local origin=$(dir_part $1)
>+	local flavor	# =$(flavor_part $1)
>+	local iport="$2"
>+	local dir="$pd/$origin"
>+
>+	if [ -d "$dir" ]; then
>+	local IFS=' '
>+	local pkgname=${iport%-*}
>+	local flavors=$(pm_make -C "$dir" -V FLAVORS)
>+	for flavor in $flavors; do
>+		local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME)
>+		if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then
>+			echo "$origin@$flavor"
>+			return
>+		fi
>+	done
>+	fi
>+	echo "$1"	# should not be reached!
>+}
>+
> origin_from_pdb () {
> 	local flavor pkgname origin_flavor
> 
>@@ -1007,27 +1028,6 @@
> 		[ -n "$PM_YES" ] && return 0
> 		return 1
> 	fi
>-}
>-
>-match_flavor () {
>-	local origin=$(dir_part $1)
>-	local flavor	# =$(flavor_part $1)
>-	local iport="$2"
>-	local dir="$pd/$origin"
>-
>-	if [ -d "$dir" ]; then
>-	local IFS=' '
>-	local pkgname=${iport%-*}
>-	local flavors=$(pm_make -C "$dir" -V FLAVORS)
>-	for flavor in $flavors; do
>-		local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME)
>-		if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then
>-			echo "$origin@$flavor"
>-			return
>-		fi
>-	done
>-	fi
>-	echo "$1"	# should not be reached!
> }
> 
> # Find the new origin for moved ports

Actions: View | Diff

Attachments on bug 227882: 193549