[42736] branches/release_1_7

[blb at macports.org]

Revision: 42736
          http://trac.macports.org/changeset/42736
Author:   blb at macports.org
Date:     2008-11-29 21:10:03 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
Merge r42734 from trunk

Modified Paths:
--------------
    branches/release_1_7/base/src/upgrade_sources_conf_default.tcl

Property Changed:
----------------
    branches/release_1_7/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697
   + /trunk:42683,42697,42734

Modified: branches/release_1_7/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- branches/release_1_7/base/src/upgrade_sources_conf_default.tcl	2008-11-30 05:06:49 UTC (rev 42735)
+++ branches/release_1_7/base/src/upgrade_sources_conf_default.tcl	2008-11-30 05:10:03 UTC (rev 42736)
@@ -22,6 +22,16 @@
    exit 0
 }
 
+
+proc append_default_tag_to_line {line} {
+   if {[regexp {^(.* )\[(.*)\](.*)$} $line -> line_begin current_tag line_end]} {
+      return "${line_begin}\[${current_tag},default\]${line_end}"
+   } else {
+      return "${line} \[default\]"
+   }
+}
+
+
 set mktempChannel [open "|/usr/bin/mktemp -t macports_sources_upgrade" r]
 set tempfile [read -nonewline $mktempChannel]
 close $mktempChannel
@@ -35,7 +45,7 @@
       if {[string first {[default]} $line] >= 0} {
          set defaultSeen true
       } elseif {[regexp {^\s*rsync://rsync\.macports\.org/release/ports/} $line]} {
-         set line "$line \[default\]"
+         set line [append_default_tag_to_line $line]
          set defaultSeen true
          set defaultWritten true
       } elseif {[regexp {^\s*file://(/[^ #]+)} $line -> filepath]} {
@@ -47,7 +57,7 @@
             }
             close $svnChannel
             if {[regexp {^https?://svn\.macports\.org/repository/macports/trunk/dports} $svnURL]} {
-               set line "${line} \[default\]"
+               set line [append_default_tag_to_line $line]
                set defaultSeen true
                set defaultWritten true
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081129/9e936a66/attachment.html>