[134503] branches/release_2_3/base

cal at macports.org cal at macports.org
Fri Mar 27 12:48:17 PDT 2015


Revision: 134503
          https://trac.macports.org/changeset/134503
Author:   cal at macports.org
Date:     2015-03-27 12:48:17 -0700 (Fri, 27 Mar 2015)
Log Message:
-----------
merge r134501, r134502:
 - base: support backslashes in the paths macports installs, closes #47283
 - base: when all you have is a regex, everything looks like a regular problem

Revision Links:
--------------
    https://trac.macports.org/changeset/134501
    https://trac.macports.org/changeset/134502

Modified Paths:
--------------
    branches/release_2_3/base/src/pextlib1.0/strsed.c
    branches/release_2_3/base/src/port1.0/portinstall.tcl

Property Changed:
----------------
    branches/release_2_3/base/


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/pextlib1.0/strsed.c
===================================================================
--- branches/release_2_3/base/src/pextlib1.0/strsed.c	2015-03-27 19:42:01 UTC (rev 134502)
+++ branches/release_2_3/base/src/pextlib1.0/strsed.c	2015-03-27 19:48:17 UTC (rev 134503)
@@ -133,6 +133,8 @@
 
 /* required for strdup(3) on Linux and OS X */
 #define _XOPEN_SOURCE 600L
+/* we're using this on raw strings, no escape sequences allowed */
+#define ESCAPED_STRING
 
 #include <ctype.h>
 #include <string.h>

Modified: branches/release_2_3/base/src/port1.0/portinstall.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/portinstall.tcl	2015-03-27 19:42:01 UTC (rev 134502)
+++ branches/release_2_3/base/src/port1.0/portinstall.tcl	2015-03-27 19:48:17 UTC (rev 134503)
@@ -262,12 +262,14 @@
 
     # also save the contents for our own use later
     set installPlist {}
+    set destpathLen [string length $destpath]
     fs-traverse -depth fullpath $destpath {
         if {[file type $fullpath] eq "directory"} {
             continue
         }
-        set relpath [strsed $fullpath "s|^$destpath/||"]
-        if {![regexp {^[+]} $relpath]} {
+
+        set relpath [string range $fullpath $destpathLen+1 end]
+        if {[string index $relpath 0] ne "+"} {
             puts $fd "$relpath"
             lappend installPlist [file join [file separator] $relpath]
             if {[file isfile $fullpath]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150327/0c564bc1/attachment.html>


More information about the macports-changes mailing list