<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/1d0a9db7fe64da6384b983cb478db0728ce9e6cc">https://github.com/macports/macports-base/commit/1d0a9db7fe64da6384b983cb478db0728ce9e6cc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1d0a9db7fe64da6384b983cb478db0728ce9e6cc
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Apr 11 05:07:21 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    registry2.0: Refactor some error handling
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Keep indentation to the left.
</span>---
 src/registry2.0/portimage.tcl | 68 +++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f1639a..15a86a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,45 +351,45 @@ proc extract_archive_to_tmpdir {location} {
</span>             }
             t(ar|bz|lz|xz|gz) {
                 set tar "tar"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[catch {set tar [macports::findBinary $tar ${macports::autoconf::tar_path}]} errmsg] == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_debug "Using $tar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    set unarchive.cmd "$tar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    set unarchive.pre_args {-xvpf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    if {[regexp {z2?$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        set unarchive.args {-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if {[regexp {bz2?$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            if {![catch {macports::binaryInPath lbzip2}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                set gzip "lbzip2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            } elseif {![catch {macports::binaryInPath pbzip2}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                set gzip "pbzip2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                set gzip "bzip2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        } elseif {[regexp {lz$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set gzip "lzma"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        } elseif {[regexp {xz$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set gzip "xz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set gzip "gzip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if {[info exists macports::autoconf::${gzip}_path]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set hint [set macports::autoconf::${gzip}_path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[catch {set tar [macports::findBinary $tar ${macports::autoconf::tar_path}]} errmsg]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ui_debug $errmsg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    throw MACPORTS "No '$tar' was found on this system!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_debug "Using $tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set unarchive.cmd "$tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set unarchive.pre_args {-xvpf}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[regexp {z2?$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set unarchive.args {-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[regexp {bz2?$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        if {![catch {macports::binaryInPath lbzip2}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            set gzip "lbzip2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        } elseif {![catch {macports::binaryInPath pbzip2}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            set gzip "pbzip2"
</span>                         } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set hint ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if {[catch {set gzip [macports::findBinary $gzip $hint]} errmsg] == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            ui_debug "Using $gzip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set unarchive.pipe_cmd "$gzip -d -c ${location} |"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            ui_debug $errmsg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            throw MACPORTS "No '$gzip' was found on this system!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            set gzip "bzip2"
</span>                         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } elseif {[regexp {lz$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set gzip "lzma"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } elseif {[regexp {xz$} ${unarchive.type}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set gzip "xz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set gzip "gzip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[info exists macports::autoconf::${gzip}_path]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set hint [set macports::autoconf::${gzip}_path]
</span>                     } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        set unarchive.args "${location}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set hint ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[catch {set gzip [macports::findBinary $gzip $hint]} errmsg] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_debug "Using $gzip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set unarchive.pipe_cmd "$gzip -d -c ${location} |"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_debug $errmsg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        throw MACPORTS "No '$gzip' was found on this system!"
</span>                     }
                 } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_debug $errmsg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    throw MACPORTS "No '$tar' was found on this system!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set unarchive.args "${location}"
</span>                 }
             }
             xar {
</pre><pre style='margin:0'>

</pre>