[70270] branches/release_1_9/base/src/registry2.0

4 Aug 2010

Revision: 70270
          http://trac.macports.org/changeset/70270
Author:   jmr@macports.org
Date:     2010-08-04 00:20:13 -0700 (Wed, 04 Aug 2010)
Log Message:
-----------
merge r70269 from trunk:
 skip locking when registry dir is unwritable

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

Modified Paths:
--------------
    branches/release_1_9/base/src/registry2.0/registry.tcl

Property Changed:
----------------
    branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl


Property changes on: branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595,67717,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68786,68806,68816-68817,68849,68851,68864,68872,68902,68910,68913,68919,68950,68952,68965,69001,69019,69022,69105,69191,69316,69318,69334-69335,69387,69436,69470,69887,70009-70010,70120,70135,70138,70143,70163,70174
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692
   + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595,67717,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68786,68806,68816-68817,68849,68851,68864,68872,68902,68910,68913,68919,68950,68952,68965,69001,69019,69022,69105,69191,69316,69318,69334-69335,69387,69436,69470,69887,70009-70010,70120,70135,70138,70143,70163,70174,70269
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692

Modified: branches/release_1_9/base/src/registry2.0/registry.tcl
===================================================================

--- branches/release_1_9/base/src/registry2.0/registry.tcl	2010-08-04 07:17:19 UTC (rev 70269)
+++ branches/release_1_9/base/src/registry2.0/registry.tcl	2010-08-04 07:20:13 UTC (rev 70270)
@@ -401,6 +401,10 @@
     }
     set lockpath [file join ${registry.path} registry .registry.lock]
     if {![info exists lockfd]} {
+        if {![file writable [file dirname $lockpath]]} {
+            # skip locking, registry can't be modified anyway
+            return
+        }
         set lockfd [::open $lockpath w]
     }
     if {[catch {flock $lockfd -exclusive -noblock} result]} {

    

jmr＠macports.org

tags

participants (1)