]> CyberLeo.Net >> Repos - FreeBSD/releng/10.0.git/commit
MFS r259613:
authorbdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 19 Dec 2013 13:44:07 +0000 (13:44 +0000)
committerbdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 19 Dec 2013 13:44:07 +0000 (13:44 +0000)
commitd6d53f95441ef24abdf50696ba5a583adfed8ea9
treefb5245b225c952137cb6f98f4ae7558bb358fac8
parente8d6d5bff62e1fb6823e02494b8c4eceabaf6496
MFS r259613:

  Fix multi-repository support by properly respecting 'enabled' flag.

  This will read the REPOS_DIR env/config setting (default is /etc/pkg
  and /usr/local/etc/pkg/repos) and use the last enabled repository.

  This can be changed in the environment using a comma-separated list,
  or in /usr/local/etc/pkg.conf with JSON array syntax of:
      REPOS_DIR: ["/etc/pkg", "/usr/local/etc/pkg/repos"]

Approved by: bapt (mentor)
Approved by: re (gjb)

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259614 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
usr.sbin/pkg/config.c
usr.sbin/pkg/config.h
usr.sbin/pkg/pkg.7