[140300] trunk/base

[ijackson at macports.org]

Revision: 140300
          https://trac.macports.org/changeset/140300
Author:   ijackson at macports.org
Date:     2015-09-16 11:59:58 -0700 (Wed, 16 Sep 2015)
Log Message:
-----------
Merge r138631 from branches/gsoc15-dependency.

Add conflicts field to Portindex. Conflicts field is
required by libsolv for conflict resolution during dependency
calculation.

Revision Links:
--------------
    https://trac.macports.org/changeset/138631

Modified Paths:
--------------
    trunk/base/src/port/portindex.tcl

Property Changed:
----------------
    trunk/base/


Property changes on: trunk/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/gsoc14-cleanup:123738-124046
/branches/gsoc14-interactive/base:119516-124240
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/gsoc14-cleanup:123738-124046
/branches/gsoc14-interactive/base:119516-124240
/branches/gsoc15-dependency/base:138631
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: trunk/base/src/port/portindex.tcl
===================================================================
--- trunk/base/src/port/portindex.tcl	2015-09-16 17:01:27 UTC (rev 140299)
+++ trunk/base/src/port/portindex.tcl	2015-09-16 18:59:58 UTC (rev 140300)
@@ -273,7 +273,7 @@
 foreach key {categories depends_fetch depends_extract depends_build \
              depends_lib depends_run description epoch homepage \
              long_description maintainers name platforms revision variants \
-             version portdir replaced_by license installs_libs} {
+             version portdir replaced_by license installs_libs conflicts} {
     set keepkeys($key) 1
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150916/8243f038/attachment.html>