[67839] branches/release_1_9/base/src/macports1.0/macports.tcl

jmr at macports.org jmr at macports.org
Wed May 19 07:51:42 PDT 2010


Revision: 67839
          http://trac.macports.org/changeset/67839
Author:   jmr at macports.org
Date:     2010-05-19 07:51:38 -0700 (Wed, 19 May 2010)
Log Message:
-----------
merge r67838 from trunk:
 hack around creation of too many sqlite temp files by portfile subinterpreters (#24857)

Revision Links:
--------------
    http://trac.macports.org/changeset/67838

Modified Paths:
--------------
    branches/release_1_9/base/src/macports1.0/macports.tcl

Modified: branches/release_1_9/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_9/base/src/macports1.0/macports.tcl	2010-05-19 14:35:03 UTC (rev 67838)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl	2010-05-19 14:51:38 UTC (rev 67839)
@@ -1524,6 +1524,8 @@
             catch {cd $portpath}
             $workername eval eval_targets clean
         }
+        # XXX hack to avoid running out of fds due to sqlite temp files, ticket #24857
+        interp delete $workername
         macports::pop_log
         return 0
     } else {
@@ -2350,7 +2352,10 @@
     if {$refcnt == 0} {
         dlist_delete macports::open_mports $mport
         set workername [ditem_key $mport workername]
-        interp delete $workername
+        # the hack in _mportexec might have already deleted the worker
+        if {[interp exists $workername]} {
+            interp delete $workername
+        }
         ditem_delete $mport
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100519/29f03e55/attachment.html>


More information about the macports-changes mailing list