Ticket #49759: bzr-git-progress.patch

/opt/local/libexec/macports/lib/port1.0/portfetch.tcl

@@ -68 +68 @@
 default bzr.cmd {[findBinary bzr $portutil::autoconf::bzr_path]}
 default bzr.dir {${workpath}}
 default bzr.revision {-1}
-default bzr.pre_args {"--builtin --no-aliases checkout --lightweight --verbose"}
+default bzr.env {BZR_PROGRESS_BAR=text}
+default bzr.pre_args {"--builtin --no-aliases checkout --lightweight"}
 default bzr.args ""
-default bzr.post_args {"-r ${bzr.revision} ${bzr.url} ${worksrcdir}"}
+default bzr.post_args {"-r ${bzr.revision} ${bzr.url} ${worksrcdir} 2>&1 | tr -su '\\\\r' '\\\\n'"}
 
 default cvs.cmd {[findBinary cvs $portutil::autoconf::cvs_path]}
 default cvs.password ""
@@ -433 +434 @@
         # if we're just using HEAD, we can make a shallow repo
         append options " --depth=1"
     }
-    set cmdstring "${git.cmd} clone $options ${git.url} ${worksrcpath} 2>&1"
+    set cmdstring "${git.cmd} clone $options ${git.url} ${worksrcpath} 2>&1 | tr -su '\\r' '\\n' 2>&1"
     ui_debug "Executing: $cmdstring"
     if {[catch {system $cmdstring} result]} {
         return -code error [msgcat::mc "Git clone failed"]