From 09a06d574c76371497626e9b1a94fefae583d4b9 Mon Sep 17 00:00:00 2001
From: Joshua Root <jmr@macports.org>
Date: Sat, 10 Mar 2018 13:35:16 +1100
Subject: [PATCH] Clean before mirroring

---
 tools/mirror-multi.tcl | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tools/mirror-multi.tcl b/tools/mirror-multi.tcl
index 9f112df..1ec6ff4 100755
--- a/tools/mirror-multi.tcl
+++ b/tools/mirror-multi.tcl
@@ -154,9 +154,12 @@ proc mirror_port {portinfo_list} {
     set any_failed 0
     # have to checksum too since the mirror target claims to succeed
     # even if the checksums were wrong and the files deleted
-    if {$do_mirror && ([mportexec $mport mirror] != 0 || [mportexec $mport checksum] != 0)} {
-        set any_failed 1
-        set tried_and_failed($portname) 1
+    if {$do_mirror} {
+        mportexec $mport clean
+        if {[mportexec $mport mirror] != 0 || [mportexec $mport checksum] != 0} {
+            set any_failed 1
+            set tried_and_failed($portname) 1
+        }
     }
     mportclose $mport
 
@@ -174,8 +177,11 @@ proc mirror_port {portinfo_list} {
         array unset portinfo
         array set portinfo [mportinfo $mport]
         lappend deps {*}[get_dep_list portinfo]
-        if {$do_mirror && ([mportexec $mport mirror] != 0  || [mportexec $mport checksum] != 0)} {
-            set any_failed 1
+        if {$do_mirror} {
+            mportexec $mport clean
+            if {[mportexec $mport mirror] != 0  || [mportexec $mport checksum] != 0} {
+                set any_failed 1
+            }
         }
         mportclose $mport
     }
@@ -191,8 +197,11 @@ proc mirror_port {portinfo_list} {
         array unset portinfo
         array set portinfo [mportinfo $mport]
         lappend deps {*}[get_dep_list portinfo]
-        if {$do_mirror && ([mportexec $mport mirror] != 0 || [mportexec $mport checksum] != 0)} {
-            set any_failed 1
+        if {$do_mirror} {
+            mportexec $mport clean
+            if {[mportexec $mport mirror] != 0 || [mportexec $mport checksum] != 0} {
+                set any_failed 1
+            }
         }
         mportclose $mport
     }