Changeset 15872 for trunk/base


Ignore:
Timestamp:
Jan 16, 2006, 4:15:38 AM (15 years ago)
Author:
jberry
Message:

Move error check for missing Portfile so that we don't add to the open_dports list a port that we'll later fail on -- but maybe we should move the append to the open_dports list to very end in case we error out while eval'ing the Portfile?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r15691 r15872  
    11# darwinports.tcl
    2 # $Id: darwinports.tcl,v 1.203 2006/01/05 06:40:56 olegb Exp $
     2# $Id: darwinports.tcl,v 1.204 2006/01/16 04:15:38 jberry Exp $
    33#
    44# Copyright (c) 2002 Apple Computer, Inc.
     
    699699        cd $portdir
    700700        set portpath [pwd]
     701    if {![file isfile Portfile]} {
     702        return -code error "Could not find Portfile in $portdir"
     703    }
     704
    701705        set workername [interp create]
    702706
     
    709713        ditem_key $dport variations $variations
    710714        ditem_key $dport refcnt 1
    711 
     715       
    712716    darwinports::worker_init $workername $portpath [darwinports::getportbuildpath $portpath] $options $variations
    713     if {![file isfile Portfile]} {
    714         return -code error "Could not find Portfile in $portdir"
    715     }
    716717
    717718    $workername eval source Portfile
    718        
     719
    719720    ditem_key $dport provides [$workername eval return \$portname]
    720721
Note: See TracChangeset for help on using the changeset viewer.