[146638] branches/vcs-fetch/base/src/port1.0/portfetch.tcl

[raimue at macports.org]

Revision: 146638
          https://trac.macports.org/changeset/146638
Author:   raimue at macports.org
Date:     2016-03-14 10:15:44 -0700 (Mon, 14 Mar 2016)
Log Message:
-----------
Move portfetch::fetchfiles for patchfiles with non-standard fetch.type

Modified Paths:
--------------
    branches/vcs-fetch/base/src/port1.0/portfetch.tcl

Modified: branches/vcs-fetch/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/vcs-fetch/base/src/port1.0/portfetch.tcl	2016-03-14 16:55:15 UTC (rev 146637)
+++ branches/vcs-fetch/base/src/port1.0/portfetch.tcl	2016-03-14 17:15:44 UTC (rev 146638)
@@ -320,10 +320,6 @@
         }
     }
 
-    if {[info exists patchfiles]} {
-        return [portfetch::fetchfiles]
-    }
-
     return 0
 }
 
@@ -367,9 +363,6 @@
         return -code error [msgcat::mc "CVS check out failed"]
     }
 
-    if {[info exists patchfiles]} {
-        return [portfetch::fetchfiles]
-    }
     return 0
 }
 
@@ -418,10 +411,6 @@
         return -code error [msgcat::mc "Subversion check out failed"]
     }
 
-    if {[info exists patchfiles]} {
-        return [portfetch::fetchfiles]
-    }
-
     return 0
 }
 
@@ -465,10 +454,6 @@
     }
     file rename -force "${generatedfile}.TMP" "${generatedfile}"
 
-    if {[info exists patchfiles]} {
-        return [portfetch::fetchfiles]
-    }
-
     return 0
 }
 
@@ -488,10 +473,6 @@
         return -code error [msgcat::mc "Mercurial clone failed"]
     }
 
-    if {[info exists patchfiles]} {
-        return [portfetch::fetchfiles]
-    }
-
     return 0
 }
 
@@ -656,12 +637,14 @@
 
     # Fetch the files
     switch -- "${fetch.type}" {
-        bzr     { return [bzrfetch] }
-        cvs     { return [cvsfetch] }
-        svn     { return [svnfetch] }
-        git     { return [gitfetch] }
-        hg      { return [hgfetch] }
-        standard -
-        default { return [portfetch::fetchfiles] }
+        bzr     { bzrfetch }
+        cvs     { cvsfetch }
+        svn     { svnfetch }
+        git     { gitfetch }
+        hg      { hgfetch }
     }
+
+    if {${fetch.type} eq "standard" || ${fetch.type} eq "default" || [info exists patchfiles]} {
+        return [portfetch::fetchfiles]
+    }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160314/5a47ffc9/attachment-0001.html>