Changeset 5563


Ignore:
Timestamp:
Feb 23, 2004, 10:52:55 PM (16 years ago)
Author:
jkh
Message:

Rationalize cvs and fetch args.
Approved by: landonf

File:
1 edited

Legend:

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

    r5067 r5563  
    5555default cvs.tag HEAD
    5656default cvs.env {CVS_PASSFILE=${workpath}/.cvspass}
    57 default cvs.pre_args {"-f -d ${cvs.root}"}
     57default cvs.pre_args {"-f -d ${cvs.root} co -r ${cvs.tag} ${cvs.module}"}
     58default cvs.args ""
    5859
    5960# Set distfiles
     
    6364default fetch.cmd curl
    6465default fetch.dir {${distpath}}
    65 default fetch.args {"-o ${distfile}.TMP"}
    66 default fetch.pre_args {"-f -L"}
     66default fetch.pre_args {"-f -L -o ${distfile}.TMP"}
    6767default fetch.post_args {[portfetch::assemble_url ${site} ${distfile}]}
    6868
     
    263263# information in a custom .cvspass file
    264264proc cvsfetch {args} {
    265     global workpath cvs.password cvs.args cvs.post_args cvs.tag cvs.module cvs.cmd cvs.env cvs.root
     265    global workpath cvs.password cvs.args cvs.cmd cvs.env cvs.root
    266266    cd $workpath
    267267    exec touch .cvspass
    268268    if {[regexp ^:pserver: ${cvs.root}]} {
     269        set saveargs ${cvs.args}
     270        set savecmd ${cvs.cmd}
    269271        set cvs.args login
    270272        set cvs.cmd "echo ${cvs.password} | /usr/bin/env ${cvs.env} cvs"
     
    274276            return -code error [msgcat::mc "CVS login failed"]
    275277        }
     278        set cvs.args ${saveargs}
     279        set cvs.cmd ${savecmd}
    276280    } else {
    277281        set env(CVS_RSH) ssh
    278282    }
    279     set cvs.args "co -r ${cvs.tag}"
    280     set cvs.cmd cvs
    281     set cvs.post_args "${cvs.module}"
    282283    if {[catch {system "[command cvs] 2>&1"} result]} {
    283284        return -code error [msgcat::mc "CVS check out failed"]
Note: See TracChangeset for help on using the changeset viewer.