[24610] branches/dp2mp-move/base/src

[source_changes at macosforge.org]

Revision: 24610
          http://trac.macosforge.org/projects/macports/changeset/24610
Author:   jmpp at macports.org
Date:     2007-04-28 18:41:03 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Merge r24576 and r24608: support for tbz2 archives at unarchival time and in portutil.tcl as a generally supported archive format.

Modified Paths:
--------------
    branches/dp2mp-move/base/src/package1.0/portunarchive.tcl
    branches/dp2mp-move/base/src/port1.0/portutil.tcl

Modified: branches/dp2mp-move/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portunarchive.tcl	2007-04-29 01:39:12 UTC (rev 24609)
+++ branches/dp2mp-move/base/src/package1.0/portunarchive.tcl	2007-04-29 01:41:03 UTC (rev 24610)
@@ -197,9 +197,9 @@
 				ui_debug "Using $tar"
 				set unarchive.cmd "$tar"
 				set unarchive.pre_args {-xvpf}
-				if {[regexp {z$} ${unarchive.type}]} {
+				if {[regexp {z2?$} ${unarchive.type}]} {
 					set unarchive.args {-}
-					if {[regexp {bz$} ${unarchive.type}]} {
+					if {[regexp {bz2?$} ${unarchive.type}]} {
 						set gzip "bzip2"
 					} else {
 						set gzip "gzip"

Modified: branches/dp2mp-move/base/src/port1.0/portutil.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portutil.tcl	2007-04-29 01:39:12 UTC (rev 24609)
+++ branches/dp2mp-move/base/src/port1.0/portutil.tcl	2007-04-29 01:41:03 UTC (rev 24610)
@@ -1740,8 +1740,8 @@
 		t(ar|bz|gz) {
 			set tar "tar"
 			if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
-				if {[regexp {z$} $type]} {
-					if {[regexp {bz$} $type]} {
+				if {[regexp {z2?$} $type]} {
+					if {[regexp {bz2?$} $type]} {
 						set gzip "bzip2"
 					} else {
 						set gzip "gzip"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070428/013a0760/attachment.html