Add a -fetch-original switch to dopackages that fetches the distfiles from

the listed MASTER_SITES instead of ftp-master.  Pass the FETCH_ORIGINAL
environment variable to pdispatch and as a command-line switch to
portbuild.

3 files changed, 16 insertions, 1 deletions

diff --git a/Tools/portbuild/scripts/dopackages b/Tools/portbuild/scripts/dopackages
index 43b5490a1656..e56d42c5954e 100755
--- a/Tools/portbuild/scripts/dopackages
+++ b/Tools/portbuild/scripts/dopackages
@@ -20,7 +20,7 @@ errorexit () {
 }
 
 usage () {
-  echo "usage: [-continue] [-nofinish] [-finish] [-restart] [-ftp] [-cdrom] [-nodummy] [-nobuild] [-noindex] [-noduds] [-nocvsup] [-nocvs] [-noportscvs] [-norestr] [-plistcheck] [-distfiles] branch date"
+  echo "usage: [-continue] [-nofinish] [-finish] [-restart] [-ftp] [-cdrom] [-nodummy] [-nobuild] [-noindex] [-noduds] [-nocvsup] [-nocvs] [-noportscvs] [-norestr] [-plistcheck] [-distfiles] [-fetch-original] branch date"
   errorexit 1
 }
 
@@ -205,6 +205,7 @@ cont=0
 finish=0
 nofinish=0
 dodistfiles=0
+fetch_orig=0
 
 # optional arguments
 while [ $# -gt 2 ]; do
@@ -245,6 +246,9 @@ while [ $# -gt 2 ]; do
     x-distfiles)
       dodistfiles=1
       ;;
+    x-fetch-original)
+      fetch_orig=1
+      ;;
     x-continue)
       cont=1
       ;;
@@ -301,6 +305,10 @@ if [ "$cdrom" = 1 ]; then
   export FOR_CDROM=1
 fi
 
+if [ "$fetch_orig" = 1 ]; then
+  export FETCH_ORIGINAL=1
+fi
+
 export DISTDIR=${pb}/${arch}/${branch}/distfiles
 export PACKAGES=${pb}/${arch}/${branch}/packages
 
diff --git a/Tools/portbuild/scripts/pdispatch b/Tools/portbuild/scripts/pdispatch
index 813ec66b40ef..05be19ae01ce 100755
--- a/Tools/portbuild/scripts/pdispatch
+++ b/Tools/portbuild/scripts/pdispatch
@@ -51,6 +51,9 @@ fi
 if [ "x$WANT_DISTFILES" != "x" ]; then
   flags="${flags} -distfiles"
 fi
+if [ "x$FETCH_ORIGINAL" != "x" ]; then
+  flags="${flags} -fetch-original"
+fi
 
 echo "dispatching: ssh -a -t -n root@$1 ${command} ${arch} ${branch} $flags $args at $(date)"
 ${pb}/scripts/ptimeout.host $timeout ssh -a -t -n root@$1 ${command} ${arch} ${branch} ${flags} $args
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index 94d90111968c..677d76e88909 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -86,6 +86,10 @@ if [ "x$1" = "x-distfiles" ]; then
   nodistfiles=0
   shift
 fi
+if [ "x$1" = "x-fetch-original" ]; then
+  export FETCH_ORIGINAL=1
+  shift
+fi
 args="$*"
 
 buildenv ${pb} ${arch} ${branch}