[48759] trunk/base

[afb at macports.org]

Revision: 48759
          http://trac.macports.org/changeset/48759
Author:   afb at macports.org
Date:     2009-03-28 06:11:09 -0700 (Sat, 28 Mar 2009)
Log Message:
-----------
xpkg is a package format, not an archive format <duh>

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/src/package1.0/portunarchive.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2009-03-28 10:53:17 UTC (rev 48758)
+++ trunk/base/ChangeLog	2009-03-28 13:11:09 UTC (rev 48759)
@@ -62,7 +62,7 @@
     - Add several new options to port search, looks in name and description by
       default (#15434, raimue)
 
-    - Add xpkg archive type, xar-based format with XML. (afb)
+    - Add xpkg package type, xar-based format with XML. (afb)
 
     - Split portpkg creation out from portsubmit phase. (afb)
 

Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl	2009-03-28 10:53:17 UTC (rev 48758)
+++ trunk/base/src/package1.0/portunarchive.tcl	2009-03-28 13:11:09 UTC (rev 48759)
@@ -223,7 +223,7 @@
 				return -code error "No '$tar' was found on this system!"
 			}
 		}
-		(xar|xpkg) {
+		xar {
 			set xar "xar"
 			if {[catch {set xar [binaryInPath $xar]} errmsg] == 0} {
 				ui_debug "Using $xar"

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-03-28 10:53:17 UTC (rev 48758)
+++ trunk/base/src/port1.0/portutil.tcl	2009-03-28 13:11:09 UTC (rev 48759)
@@ -2295,7 +2295,7 @@
                 }
             }
         }
-        xar|xpkg {
+        xar {
             set xar "xar"
             if {[catch {set xar [binaryInPath $xar]} errmsg] == 0} {
                 return 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090328/e6bb7587/attachment-0001.html>