[42734] trunk/base/src/upgrade_sources_conf_default.tcl

[blb at macports.org]

Revision: 42734
          http://trac.macports.org/changeset/42734
Author:   blb at macports.org
Date:     2008-11-29 20:58:48 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
Fix issue where a tag (nosync) was already present in sources.conf, resulting
in '... [nosync] [default]' which is incorrect; now it results in the
correct form of '... [nosync,default]'

Modified Paths:
--------------
    trunk/base/src/upgrade_sources_conf_default.tcl

Modified: trunk/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- trunk/base/src/upgrade_sources_conf_default.tcl	2008-11-30 04:51:41 UTC (rev 42733)
+++ trunk/base/src/upgrade_sources_conf_default.tcl	2008-11-30 04:58:48 UTC (rev 42734)
@@ -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/68f3c4c0/attachment-0001.html>