Changeset 14412


Ignore:
Timestamp:
Oct 4, 2005, 5:08:26 PM (15 years ago)
Author:
pguyot (Paul Guyot)
Message:

Remove support for old fetch.args parameter.
Thanks Charlie for removing all references to this in portfiles.

File:
1 edited

Legend:

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

    r14217 r14412  
    11# et:ts=4
    22# portfetch.tcl
    3 # $Id: portfetch.tcl,v 1.104 2005/09/22 01:25:31 jberry Exp $
     3# $Id: portfetch.tcl,v 1.105 2005/10/04 17:08:26 pguyot Exp $
    44#
    55# Copyright (c) 2002 - 2003 Apple Computer, Inc.
     
    4343# define options: distname master_sites
    4444options master_sites patch_sites extract.suffix distfiles patchfiles use_zip use_bzip2 dist_subdir \
    45         fetch.type fetch.args fetch.user fetch.password fetch.use_epsv \
     45        fetch.type fetch.user fetch.password fetch.use_epsv \
    4646        master_sites.mirror_subdir patch_sites.mirror_subdir portname \
    4747        cvs.module cvs.root cvs.password cvs.date cvs.tag \
     
    7979default distfiles {[suffix $distname]}
    8080default dist_subdir {${portname}}
    81 
    82 # support for fetch.args for backward compatibility.
    83 default fetch.args ""
    8481
    8582# user name & password
     
    369366proc fetchfiles {args} {
    370367        global distpath all_dist_files UI_PREFIX fetch_urls
    371         global fetch.args fetch.user fetch.password fetch.use_epsv
     368        global fetch.user fetch.password fetch.use_epsv
    372369        global distfile site
    373370        global portverbose
     
    379376        }
    380377       
    381         # Fetch options.
    382         ### backward compatibility (remove when all ports have been updated)
    383         if {[llength ${fetch.args}] > 1} {
    384                 if {[lindex ${fetch.args} 0] == "-u"} {
    385                         ui_warn "fetch.args is deprecated, use fetch.user & fetch.password instead"
    386                         # -u case (port ksh93)
    387                         set theuserpwd [eval concat [lrange ${fetch.args} 1 end]]
    388                         set fetch_options "-u $theuserpwd"
    389                 } else {
    390                         return -code error [format [msgcat::mc "fetch.args is deprecated, format unrecognized (%s)"] ${fetch.args}]
    391                 }
    392         } elseif {${fetch.args} == "--disable-epsv"} {
    393                 # --disable-epsv case.
    394                 ui_warn "fetch.args is deprecated, use fetch.use_epsv instead"
    395                 set fetch_options ${fetch.args}
    396         } elseif {${fetch.args} != ""} {
    397                 return -code error [format [msgcat::mc "fetch.args is deprecated, format unrecognized (%s)"] ${fetch.args}]
    398         } else {
    399                 set fetch_options {}
    400         }
    401378        if {[string length ${fetch.user}] || [string length ${fetch.password}]} {
    402379                lappend fetch_options -u
Note: See TracChangeset for help on using the changeset viewer.