|
Lines 561-566
Link Here
|
| 561 |
return 1 |
561 |
return 1 |
| 562 |
} |
562 |
} |
| 563 |
|
563 |
|
|
|
564 |
match_flavor () { |
| 565 |
local origin=$(dir_part $1) |
| 566 |
local flavor # =$(flavor_part $1) |
| 567 |
local iport="$2" |
| 568 |
local dir="$pd/$origin" |
| 569 |
|
| 570 |
if [ -d "$dir" ]; then |
| 571 |
local IFS=' ' |
| 572 |
local pkgname=${iport%-*} |
| 573 |
local flavors=$(pm_make -C "$dir" -V FLAVORS) |
| 574 |
for flavor in $flavors; do |
| 575 |
local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME) |
| 576 |
if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then |
| 577 |
echo "$origin@$flavor" |
| 578 |
return |
| 579 |
fi |
| 580 |
done |
| 581 |
fi |
| 582 |
echo "$1" # should not be reached! |
| 583 |
} |
| 584 |
|
| 564 |
origin_from_pdb () { |
585 |
origin_from_pdb () { |
| 565 |
local flavor pkgname origin_flavor |
586 |
local flavor pkgname origin_flavor |
| 566 |
|
587 |
|
|
Lines 1007-1033
Link Here
|
| 1007 |
[ -n "$PM_YES" ] && return 0 |
1028 |
[ -n "$PM_YES" ] && return 0 |
| 1008 |
return 1 |
1029 |
return 1 |
| 1009 |
fi |
1030 |
fi |
| 1010 |
} |
|
|
| 1011 |
|
| 1012 |
match_flavor () { |
| 1013 |
local origin=$(dir_part $1) |
| 1014 |
local flavor # =$(flavor_part $1) |
| 1015 |
local iport="$2" |
| 1016 |
local dir="$pd/$origin" |
| 1017 |
|
| 1018 |
if [ -d "$dir" ]; then |
| 1019 |
local IFS=' ' |
| 1020 |
local pkgname=${iport%-*} |
| 1021 |
local flavors=$(pm_make -C "$dir" -V FLAVORS) |
| 1022 |
for flavor in $flavors; do |
| 1023 |
local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME) |
| 1024 |
if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then |
| 1025 |
echo "$origin@$flavor" |
| 1026 |
return |
| 1027 |
fi |
| 1028 |
done |
| 1029 |
fi |
| 1030 |
echo "$1" # should not be reached! |
| 1031 |
} |
1031 |
} |
| 1032 |
|
1032 |
|
| 1033 |
# Find the new origin for moved ports |
1033 |
# Find the new origin for moved ports |