<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d54e1dea85ae99ccda2e522579d1a4fa667d834b">https://github.com/macports/macports-base/commit/d54e1dea85ae99ccda2e522579d1a4fa667d834b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d54e1dea8 extract_archive_metadata: ignore tar errors on Tiger
</span>d54e1dea8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d54e1dea85ae99ccda2e522579d1a4fa667d834b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Sep 26 15:22:09 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> extract_archive_metadata: ignore tar errors on Tiger
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70622
</span>---
src/port1.0/portutil.tcl | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 84334afab..04b672fd9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2807,7 +2807,19 @@ proc extract_archive_metadata {archive_location archive_type metadata_type} {
</span> switch -- $archive_type {
tbz -
tbz2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set raw_contents [exec -ignorestderr [findBinary tar ${portutil::autoconf::tar_path}] -xOj${qflag}f $archive_location ./+CONTENTS]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.major os.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 8 && ${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/70622
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tar_cmd [string cat [findBinary tar ${portutil::autoconf::tar_path}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " -xOj${qflag}f [shellescape $archive_location] ./+CONTENTS" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " 2>/dev/null || true"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set raw_contents [exec -ignorestderr /bin/sh -c $tar_cmd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$raw_contents eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "extracting +CONTENTS from $archive_location failed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set raw_contents [exec -ignorestderr [findBinary tar ${portutil::autoconf::tar_path}] -xOj${qflag}f $archive_location ./+CONTENTS]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
tgz {
set raw_contents [exec -ignorestderr [findBinary tar ${portutil::autoconf::tar_path}] -xOz${qflag}f $archive_location ./+CONTENTS]
</pre><pre style='margin:0'>
</pre>