diff options
| author | mat <mat@FreeBSD.org> | 2019-01-11 20:50:51 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2019-01-11 20:50:51 +0800 |
| commit | 017316d768563bd749fd39866578d38dc30f160b (patch) | |
| tree | bb878c46faffa328f28e9f36cea4d00612a36d6c | |
| parent | 4ae69efb91868d39ee6e8f4252d7447f476023a2 (diff) | |
| download | freebsd-ports-gnome-017316d768563bd749fd39866578d38dc30f160b.tar.gz freebsd-ports-gnome-017316d768563bd749fd39866578d38dc30f160b.tar.zst freebsd-ports-gnome-017316d768563bd749fd39866578d38dc30f160b.zip | |
Fix proxydeps QA check when multiple flavor of a package are installed.
Previously it would do this:
$ pkg which -q -o /usr/local/lib/libphonon4qt5.so
multimedia/phonon
$ pkg pkg annotate -q -S multimedia/phonon flavor
qt4
qt5
And that would break things in an interesting way.
This changes makes it use the package name of the required file, which
is unique.
Note that this problem would probably only ever happen on a live system.
I was not able to find a single port that would trigger this it in a
clean environment (poudriere testport).
PR: 231332
Submitted by: dbn
| -rw-r--r-- | Mk/Scripts/qa.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 7dfe186f1adb..8105a21aeea3 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -654,7 +654,7 @@ proxydeps() { # If we don't already depend on it, and we don't provide it if ! listcontains ${dep_file_pkg} "${LIB_RUN_DEPENDS} ${PKGORIGIN}"; then # If the package has a flavor, check that the dependency is not on that particular flavor. - flavor=$(pkg annotate -q -S "${dep_file_pkg}" flavor) + flavor=$(pkg annotate -q -S "$(pkg which -q "${dep_file}")" flavor) if [ -n "${flavor}" ]; then if listcontains ${dep_file_pkg}@${flavor} "${LIB_RUN_DEPENDS} ${PKGORIGIN}"; then continue |