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

[jmr at macports.org]

Revision: 68850
          http://trac.macports.org/changeset/68850
Author:   jmr at macports.org
Date:     2010-06-15 13:43:17 -0700 (Tue, 15 Jun 2010)
Log Message:
-----------
merge r68849 from trunk:
 fix syntax error in conflict detection (#25255)

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

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

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

Modified: branches/release_1_9/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/release_1_9/base/src/registry2.0/portimage.tcl	2010-06-15 20:41:14 UTC (rev 68849)
+++ branches/release_1_9/base/src/registry2.0/portimage.tcl	2010-06-15 20:43:17 UTC (rev 68850)
@@ -483,7 +483,7 @@
                             # the registry
                             if { $owner != {} && $owner != $port } {
                                 throw registry::image-error "Image error: $file is being used by the active [$owner name] port.  Please deactivate this port first, or use 'port -f activate [$port name]' to force the activation."
-                            } elseif { $owner == {} && ![catch {[file type $file]}] } {
+                            } elseif { $owner == {} && ![catch {file type $file}] } {
                                 throw registry::image-error "Image error: $file already exists and does not belong to a registered port.  Unable to activate port [$port name]. Use 'port -f activate [$port name]' to force the activation."
                             }
                         }


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,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697
/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,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68806,68816-68817,68849
/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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100615/18964f7e/attachment.html>