Changeset 140300


Ignore:
Timestamp:
Sep 16, 2015, 6:59:58 PM (5 years ago)
Author:
ijackson@…
Message:

Merge r138631 from branches/gsoc15-dependency.

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

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base

  • trunk/base/src/port/portindex.tcl

    r134990 r140300  
    274274             depends_lib depends_run description epoch homepage \
    275275             long_description maintainers name platforms revision variants \
    276              version portdir replaced_by license installs_libs} {
     276             version portdir replaced_by license installs_libs conflicts} {
    277277    set keepkeys($key) 1
    278278}
Note: See TracChangeset for help on using the changeset viewer.