Ignore:
Timestamp:
Apr 30, 2006, 5:32:52 AM (14 years ago)
Author:
pguyot (Paul Guyot)
Message:

Suffixes are supported in patchfiles specifications, but the patch command
actually didn't parse the filename and didn't even warn when the patch is not
applied because it cannot be found.

This change fixes that by:

  • moving the distname and disttag-related functions to portutil.tcl
  • fixing portfetch.tcl to actually end up with an error if a patch file cannot

be found (instead of silently ignoring it)

  • fixing portfetch.tcl to actually consider the distname part of the patch files

instead of the whole entry with the optional tag.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portpatch.tcl

    r13738 r17792  
    11# et:ts=4
    22# portpatch.tcl
    3 # $Id: portpatch.tcl,v 1.29 2005/08/27 00:07:30 pguyot Exp $
     3# $Id: portpatch.tcl,v 1.30 2006/04/30 05:32:52 pguyot Exp $
    44#
    55# Copyright (c) 2002 - 2003 Apple Computer, Inc.
     
    5858
    5959    foreach patch [option patchfiles] {
    60         if {[file exists [option filespath]/$patch]} {
    61             lappend patchlist [option filespath]/$patch
    62         } elseif {[file exists [option distpath]/$patch]} {
    63             lappend patchlist [option distpath]/$patch
     60    set patch_file [getdistname $patch]
     61        if {[file exists [option filespath]/$patch_file]} {
     62            lappend patchlist [option filespath]/$patch_file
     63        } elseif {[file exists [option distpath]/$patch_file]} {
     64            lappend patchlist [option distpath]/$patch_file
     65        } else {
     66                return -code error [format [msgcat::mc "Patch file %s is missing"] $patch]
    6467        }
    6568    }
Note: See TracChangeset for help on using the changeset viewer.