<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch vcs-fetch
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ba8b8327176d2de6d47cd8a5cd130398a346f2bb">https://github.com/macports/macports-base/commit/ba8b8327176d2de6d47cd8a5cd130398a346f2bb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ba8b8327176d2de6d47cd8a5cd130398a346f2bb
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Apr 12 16:18:41 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> fetch: Remove *.cmd options
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There is no need for these to be set from a Portfile. To ensure we can
</span><span style='display:block; white-space:pre;color:#404040;'> always reproduce the fetch, we should always use the versions defined in
</span><span style='display:block; white-space:pre;color:#404040;'> base.
</span>---
src/port1.0/portfetch.tcl | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 73deb9c..48d206c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,22 +49,20 @@ namespace eval portfetch {
</span> options master_sites patch_sites extract.suffix distfiles patchfiles use_bzip2 use_lzma use_xz use_zip use_7z use_lzip use_dmg dist_subdir \
fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \
master_sites.mirror_subdir patch_sites.mirror_subdir \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bzr.cmd bzr.url bzr.revision bzr.file bzr.file_prefix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cvs.cmd cvs.root cvs.password cvs.module cvs.tag cvs.date cvs.file cvs.file_prefix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.cmd svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.cmd git.url git.branch git.file git.file_prefix git.fetch_submodules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.cmd hg.url hg.tag hg.file hg.file_prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bzr.url bzr.revision bzr.file bzr.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cvs.root cvs.password cvs.module cvs.tag cvs.date cvs.file cvs.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url git.branch git.file git.file_prefix git.fetch_submodules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.url hg.tag hg.file hg.file_prefix
</span>
# Defaults
default extract.suffix .tar.gz
default fetch.type standard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default bzr.cmd {[findBinary bzr $portutil::autoconf::bzr_path]}
</span> default bzr.revision {-1}
default bzr.file {${distname}.${fetch.type}.tar.bz2}
default bzr.file_prefix {${distname}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default cvs.cmd {[findBinary cvs $portutil::autoconf::cvs_path]}
</span> default cvs.root ""
default cvs.password ""
default cvs.module {$distname}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +71,6 @@ default cvs.date ""
</span> default cvs.file {${distname}.${fetch.type}.tar.bz2}
default cvs.file_prefix {${distname}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default svn.cmd {[portfetch::find_svn_path]}
</span> default svn.url ""
default svn.revision ""
default svn.subdirs ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,14 +78,12 @@ default svn.ignore_keywords no
</span> default svn.file {${distname}.${fetch.type}.tar.bz2}
default svn.file_prefix {${distname}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default git.cmd {${prefix}/bin/git}
</span> default git.url ""
default git.branch ""
default git.file {${distname}.${fetch.type}.tar.bz2}
default git.file_prefix {${distname}}
default git.fetch_submodules "yes"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default hg.cmd {[findBinary hg $portutil::autoconf::hg_path]}
</span> default hg.tag {tip}
default hg.file {${distname}.${fetch.type}.tar.bz2}
default hg.file_prefix {${distname}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,7 +372,7 @@ proc portfetch::mktar {tarfile dir mtime {excludes {}}} {
</span> proc portfetch::bzrfetch {args} {
global UI_PREFIX \
env distpath workpath worksrcpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bzr.cmd bzr.url bzr.revision bzr.file bzr.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bzr.url bzr.revision bzr.file bzr.file_prefix \
</span> name distname fetch.type
set generatedfile "${distpath}/${bzr.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,6 +381,8 @@ proc portfetch::bzrfetch {args} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bzr.cmd [findBinary bzr $portutil::autoconf::bzr_path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Behind a proxy bzr will fail with the following error if proxies
# listed in macports.conf appear in the environment in their
# unmodified form:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -461,7 +458,7 @@ proc portfetch::bzrfetch {args} {
</span> proc portfetch::cvsfetch {args} {
global UI_PREFIX \
env distpath workpath worksrcpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cvs.cmd cvs.root cvs.password cvs.module cvs.tag cvs.date cvs.file cvs.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cvs.root cvs.password cvs.module cvs.tag cvs.date cvs.file cvs.file_prefix \
</span> name distname fetch.type \
set generatedfile "${distpath}/${cvs.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,6 +467,8 @@ proc portfetch::cvsfetch {args} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cvs.cmd [findBinary cvs $portutil::autoconf::cvs_path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set cvs.args ""
if {![string length ${cvs.tag}] && ![string length ${cvs.date}]} {
set cvs.tag "HEAD"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -571,7 +570,7 @@ proc portfetch::svn_proxy_args {url} {
</span> proc portfetch::svnfetch {args} {
global UI_PREFIX \
distpath workpath worksrcpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.cmd svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.url svn.revision svn.subdirs svn.ignore_keywords svn.file svn.file_prefix \
</span> fetch.user fetch.password \
name distname fetch.type
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,6 +580,8 @@ proc portfetch::svnfetch {args} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set svn.cmd [portfetch::find_svn_path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[regexp {\s} ${svn.url}]} {
return -code error [msgcat::mc "Subversion URL cannot contain whitespace"]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -747,7 +748,7 @@ proc portfetch::mirrorable {args} {
</span> proc portfetch::gitfetch {args} {
global UI_PREFIX portverbose \
distpath workpath worksrcpath prefix \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.url git.branch git.fetch_submodules git.file git.file_prefix git.cmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url git.branch git.fetch_submodules git.file git.file_prefix \
</span> name distname fetch.type
set generatedfile "${distpath}/${git.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -756,6 +757,8 @@ proc portfetch::gitfetch {args} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set git.cmd ${prefix}/bin/git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set options ""
if {$portverbose} {
set options "--progress"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -847,7 +850,7 @@ proc portfetch::gitfetch {args} {
</span> proc portfetch::hgfetch {args} {
global UI_PREFIX \
distpath workpath worksrcpath \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.cmd hg.url hg.tag hg.file hg.file_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.url hg.tag hg.file hg.file_prefix \
</span> name distname fetch.type fetch.ignore_sslcert
set generatedfile "${distpath}/${hg.file}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -856,6 +859,8 @@ proc portfetch::hgfetch {args} {
</span> return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hg.cmd [findBinary hg $portutil::autoconf::hg_path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ui_info "$UI_PREFIX Checking out ${fetch.type} repository"
set insecureflag ""
</pre><pre style='margin:0'>
</pre>