[31412] branches/release_1_6/base

jmpp at macports.org jmpp at macports.org
Thu Nov 22 09:40:07 PST 2007 

Revision: 31412
          http://trac.macosforge.org/projects/macports/changeset/31412
Author:   jmpp at macports.org
Date:     2007-11-22 09:40:06 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
Merged revisions 31197-31405 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r31289 | jmpp at macports.org | 2007-11-19 15:36:23 -0400 (Mon, 19 Nov 2007) | 5 lines
  
  
  Indicate that these files are not meant to hold user configurable filesystem layout options,
  we control them and should have the liberty to update them as we see fit.
........
  r31335 | afb at macports.org | 2007-11-20 07:40:16 -0400 (Tue, 20 Nov 2007) | 1 line
  
  remove etc/macports/prefix.mtree, it was deleted in r27887
........
  r31338 | jberry at macports.org | 2007-11-20 10:40:23 -0400 (Tue, 20 Nov 2007) | 1 line
  
  port(1): in interactive mode, flush output channel after issuing prompt, to avoid problem of prompt showing up after the command is given.
........
  r31339 | jberry at macports.org | 2007-11-20 10:42:05 -0400 (Tue, 20 Nov 2007) | 1 line
  
  Update ChangeLog to reflect flushing of otput channel.
........
  r31353 | nox at macports.org | 2007-11-20 22:39:29 -0400 (Tue, 20 Nov 2007) | 4 lines
  
  portutil.tcl, in {{{[command_string]}}}:
   * Removed two useless global imports.
   * Now uses {{{[append cmdstring "..."]}}} instead of {{{[set stringcmd "$stringcmd ..."]}}}, which is faster, as said in append(n) manpage.
........
  r31358 | jmpp at macports.org | 2007-11-21 01:54:23 -0400 (Wed, 21 Nov 2007) | 8 lines
  
  
  Bail out immediately from the action_variants proc if no match for the requested port was found,
  rather than foolishly trying to continue and causing a runtime error due to an unexistent array,
  thus avoiding the resulting ugly backtrace spewage to unsuspecting users.
  
  Fixes #13284
........
  r31359 | jmpp at macports.org | 2007-11-21 02:31:54 -0400 (Wed, 21 Nov 2007) | 4 lines
  
  
  Add the ftp://ftp.gnu.org/old-gnu/ mirror to the gnu mirrors list, per a suggestion in a private mail by Tobias Pyndt Steinmann, thanks!
........

Modified Paths:
--------------
    branches/release_1_6/base/ChangeLog
    branches/release_1_6/base/doc/macosx.mtree.in
    branches/release_1_6/base/doc/prefix.mtree.in
    branches/release_1_6/base/portmgr/freebsd/pkg-plist
    branches/release_1_6/base/src/port/port.tcl
    branches/release_1_6/base/src/port1.0/portutil.tcl
    branches/release_1_6/base/src/port1.0/resources/fetch/mirror_sites.tcl

Property Changed:
----------------
    branches/release_1_6/base/


Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-31196
   + /trunk/base:1-31405

Modified: branches/release_1_6/base/ChangeLog
===================================================================
--- branches/release_1_6/base/ChangeLog	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/ChangeLog	2007-11-22 17:40:06 UTC (rev 31412)
@@ -6,6 +6,9 @@
 
 Unreleased:
 
+    - Flush port(1) output channel after issuing prompt, when readline is not
+      available, to ensure prompt is displayed at proper time. (jberry r31338).
+      
     - readline is now disabled by default, in order to avoid support issues.
       use --enable-readine parameter to configure to enable support for readine.
       (jberry r31139, r31140).

Modified: branches/release_1_6/base/doc/macosx.mtree.in
===================================================================
--- branches/release_1_6/base/doc/macosx.mtree.in	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/doc/macosx.mtree.in	2007-11-22 17:40:06 UTC (rev 31412)
@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.55.2.19 2002/08/17 19:11:15 ache Exp $
+# $Id$
 #
-# Please see the file src/etc/mtree/README before making changes to this file.
+# MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
 #
 
 /set type=dir uname=root gname=wheel mode=@DSTMODE@

Modified: branches/release_1_6/base/doc/prefix.mtree.in
===================================================================
--- branches/release_1_6/base/doc/prefix.mtree.in	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/doc/prefix.mtree.in	2007-11-22 17:40:06 UTC (rev 31412)
@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.55.2.19 2002/08/17 19:11:15 ache Exp $
+# $Id$
 #
-# Please see the file src/etc/mtree/README before making changes to this file.
+# MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
 #
 
 /set type=dir uname=@DSTUSR@ gname=@DSTGRP@ mode=@DSTMODE@

Modified: branches/release_1_6/base/portmgr/freebsd/pkg-plist
===================================================================
--- branches/release_1_6/base/portmgr/freebsd/pkg-plist	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/portmgr/freebsd/pkg-plist	2007-11-22 17:40:06 UTC (rev 31412)
@@ -4,7 +4,6 @@
 bin/portmirror
 etc/macports/mp_version
 etc/macports/macports.conf
-etc/macports/prefix.mtree
 etc/macports/sources.conf
 etc/macports/variants.conf
 share/macports/Tcl/darwintrace1.0/darwintrace.so

Modified: branches/release_1_6/base/src/port/port.tcl
===================================================================
--- branches/release_1_6/base/src/port/port.tcl	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/src/port/port.tcl	2007-11-22 17:40:06 UTC (rev 31412)
@@ -1698,9 +1698,8 @@
             ui_debug "$errorInfo"
             break_softcontinue "search for portname $portname failed: $result" 1 status
         }
-    
-        if {$result == ""} {
-            puts "No port $portname found."
+        if {[llength $result] < 2} {
+            break_softcontinue "Port $portname not found" 1 status
         }
     
         array unset portinfo
@@ -2461,6 +2460,7 @@
             set len [readline read -attempted_completion attempt_completion line $prompt]
         } else {
             puts -nonewline $out $prompt
+            flush $out
             set len [gets $in line]
         }
 

Modified: branches/release_1_6/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/portutil.tcl	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/src/port1.0/portutil.tcl	2007-11-22 17:40:06 UTC (rev 31412)
@@ -215,27 +215,28 @@
 # Given a command name, assemble a command string
 # composed of the command options.
 proc command_string {command} {
-    global ${command}.dir ${command}.pre_args ${command}.args ${command}.post_args ${command}.env ${command}.type ${command}.cmd
+    global ${command}.dir ${command}.pre_args ${command}.args ${command}.post_args ${command}.cmd
     
-    set cmdstring ""
     if {[info exists ${command}.dir]} {
-	set cmdstring "cd \"[set ${command}.dir]\" &&"
+	append cmdstring "cd \"[set ${command}.dir]\" &&"
     }
     
     if {[info exists ${command}.cmd]} {
 	foreach string [set ${command}.cmd] {
-	    set cmdstring "$cmdstring $string"
+	    append cmdstring " $string"
 	}
     } else {
-	set cmdstring "$cmdstring ${command}"
+	append cmdstring " ${command}"
     }
+
     foreach var "${command}.pre_args ${command}.args ${command}.post_args" {
 	if {[info exists $var]} {
 	    foreach string [set ${var}] {
-		set cmdstring "$cmdstring $string"
+		append cmdstring " ${string}"
 	    }
 	}
     }
+
     ui_debug "Assembled command: '$cmdstring'"
     return $cmdstring
 }

Modified: branches/release_1_6/base/src/port1.0/resources/fetch/mirror_sites.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/resources/fetch/mirror_sites.tcl	2007-11-22 17:39:49 UTC (rev 31411)
+++ branches/release_1_6/base/src/port1.0/resources/fetch/mirror_sites.tcl	2007-11-22 17:40:06 UTC (rev 31412)
@@ -70,6 +70,7 @@
     ftp://ftp.lip6.fr/pub/gnu/
     ftp://ftp.chg.ru/pub/gnu/
     ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/
+    ftp://ftp.gnu.org/old-gnu/
 }
 
 set portfetch::mirror_sites::sites(gnupg) {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071122/9e2ce28c/attachment.html

More information about the macports-changes mailing list