Changeset 22584

Timestamp:

2007-03-05 08:21:38 (21 months ago)

Author:

jmpp@…

Message:

Archivemode now recognizes both tbz2 & tbz binary archives, the former being a much more common naming variation
than the latter, which is kept for backwards compatibility.

Location:

branches/release_1_4

Files:

• doc/ports.conf.5 (modified) (1 diff)
• doc/ports.conf.in (modified) (1 diff)
• src/package1.0/portarchive.tcl (modified) (1 diff)

branches/release_1_4/doc/ports.conf.5

@@ -117 +117 @@
 with the first found match being used.
 .br
-Supported types are: tgz, tar, tbz, xar, zip, cpgz, cpio
+Supported types are: tgz, tar, tbz, tbz2, xar, zip, cpgz, cpio
 .br
 .Ic Default:

branches/release_1_4/doc/ports.conf.in

@@ -35 +35 @@
 # first archive to match one of the specified types in order is used.
 #
-# Supported types: tgz (default), tar, tbz, xar, zip, cpgz, cpio
+# Supported types: tgz (default), tar, tbz, tbz2, xar, zip, cpgz, cpio
 portarchivetype         tgz
 

branches/release_1_4/src/package1.0/portarchive.tcl

@@ -176 +176 @@
                                 set archive.cmd "$tar"
                                 set archive.pre_args {-cvf}
-                                if {[regexp {z$} ${archive.type}]} {
-                                        if {[regexp {bz$} ${archive.type}]} {
+                                if {[regexp {z2?$} ${archive.type}]} {
+                                        if {[regexp {bz2?$} ${archive.type}]} {
                                                 set gzip "bzip2"
                                         } else {