[113704] trunk/base/src

[cal at macports.org]

Revision: 113704
          https://trac.macports.org/changeset/113704
Author:   cal at macports.org
Date:     2013-11-23 07:54:10 -0800 (Sat, 23 Nov 2013)
Log Message:
-----------
base: ensure $workpath and $distpath are normalized before using them in sandboxing and trace mode, fixes regression introduced by 2.2.0, closes #39850

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portmain.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2013-11-23 14:53:07 UTC (rev 113703)
+++ trunk/base/src/macports1.0/macports.tcl	2013-11-23 15:54:10 UTC (rev 113704)
@@ -2239,7 +2239,7 @@
 }
 
 proc macports::getportworkpath_from_buildpath {portbuildpath} {
-    return [file join $portbuildpath work]
+    return [file normalize [file join $portbuildpath work]]
 }
 
 proc macports::getportworkpath_from_portdir {portpath {portname {}}} {

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2013-11-23 14:53:07 UTC (rev 113703)
+++ trunk/base/src/port1.0/portmain.tcl	2013-11-23 15:54:10 UTC (rev 113704)
@@ -85,7 +85,7 @@
     } else {
         set subdir [file tail $portpath]
     }
-    return [file join $portbuildpath $subdir]
+    return [file normalize [file join $portbuildpath $subdir]]
 }
 default workpath {[getportworkpath_from_buildpath $subbuildpath]}
 default prefix /opt/local
@@ -159,16 +159,16 @@
     # set global variable indicating to other functions to use ~/.macports as well
     set usealtworkpath yes
 
-    default worksymlink {[file join ${altprefix}${portpath} work]}
-    default distpath {[file join ${altprefix}${portdbpath} distfiles ${dist_subdir}]}
+    default worksymlink {[file normalize [file join ${altprefix}${portpath} work]]}
+    default distpath {[file normalize [file join ${altprefix}${portdbpath} distfiles ${dist_subdir}]]}
     set portbuildpath "${altprefix}${portbuildpath}"
 
     ui_debug "Going to use alternate build prefix: $altprefix"
     ui_debug "workpath = $workpath"
 } else {
     set usealtworkpath no
-    default worksymlink {[file join $portpath work]}
-    default distpath {[file join $portdbpath distfiles ${dist_subdir}]}
+    default worksymlink {[file normalize [file join $portpath work]]}
+    default distpath {[file normalize [file join $portdbpath distfiles ${dist_subdir}]]}
 }
 
 # end gsoc08-privileges

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2013-11-23 14:53:07 UTC (rev 113703)
+++ trunk/base/src/port1.0/portutil.tcl	2013-11-23 15:54:10 UTC (rev 113704)
@@ -2473,7 +2473,7 @@
 # return path where a newly created image/archive for this port will be stored
 proc get_portimage_path {} {
     global portdbpath subport
-    return [file join ${portdbpath} software ${subport} [get_portimage_name]]
+    return [file normalize [file join ${portdbpath} software ${subport} [get_portimage_name]]]
 }
 
 # return list of archive types that we can extract
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131123/a8583885/attachment.html>