svn commit: r247843 - head/usr.sbin/pkg

[Baptiste Daroussin]

Author: bapt
Date: Tue Mar  5 14:08:36 2013
New Revision: 247843
URL: http://svnweb.freebsd.org/changeset/base/247843

Log:
  choose in priority the allocated ABI if any to do the ${ABI} substitution in PACKAGESITE
  
  Reviewed by:	bdrewery

Modified:
  head/usr.sbin/pkg/config.c

Modified: head/usr.sbin/pkg/config.c
==============================================================================
--- head/usr.sbin/pkg/config.c	Tue Mar  5 13:38:45 2013	(r247842)
+++ head/usr.sbin/pkg/config.c	Tue Mar  5 14:08:36 2013	(r247843)
@@ -376,7 +376,7 @@ finalize:
 		c[ABI].val = abi;
 	}
 
-	subst_packagesite(c[ABI].val);
+	subst_packagesite(c[ABI].value != NULL ? c[ABI].value : c[ABI].val);
 
 	return (0);
 }