svn commit: r489958 - head/Mk/Scripts

[Mathieu Arnold]

Author: mat
Date: Fri Jan 11 12:50:51 2019
New Revision: 489958
URL: https://svnweb.freebsd.org/changeset/ports/489958

Log:
  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

Modified:
  head/Mk/Scripts/qa.sh   (contents, props changed)

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Fri Jan 11 12:47:52 2019	(r489957)
+++ head/Mk/Scripts/qa.sh	Fri Jan 11 12:50:51 2019	(r489958)
@@ -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