[64269] trunk/base/src/registry2.0

[jmr at macports.org]

Revision: 64269
          http://trac.macports.org/changeset/64269
Author:   jmr at macports.org
Date:     2010-02-27 18:45:55 -0800 (Sat, 27 Feb 2010)
Log Message:
-----------
fix reg2 deactivate

Modified Paths:
--------------
    trunk/base/src/registry2.0/portimage.tcl
    trunk/base/src/registry2.0/util.c

Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl	2010-02-28 02:38:44 UTC (rev 64268)
+++ trunk/base/src/registry2.0/portimage.tcl	2010-02-28 02:45:55 UTC (rev 64269)
@@ -199,6 +199,8 @@
         # needs to be able to force deactivate independently of whether
         # the activation is being forced
         set force 1
+    } else {
+        set force 0
     }
     if {[string equal ${macports::registry.format} "receipt_sqlite"]} {
         set use_reg2 1
@@ -258,7 +260,7 @@
             return -code error "Image error: ${name} @${specifier} is not active."
         }
 
-        registry::check_dependents $port $force
+        registry::check_dependents $requested $force
 
         _deactivate_contents $requested {} $force
         $requested state imaged

Modified: trunk/base/src/registry2.0/util.c
===================================================================
--- trunk/base/src/registry2.0/util.c	2010-02-28 02:38:44 UTC (rev 64268)
+++ trunk/base/src/registry2.0/util.c	2010-02-28 02:45:55 UTC (rev 64269)
@@ -266,7 +266,7 @@
 int entry_to_obj(Tcl_Interp* interp, Tcl_Obj** obj, reg_entry* entry,
         reg_error* errPtr) {
     if (entry->proc == NULL) {
-        char* name = unique_name(interp, "registry::entry");
+        char* name = unique_name(interp, "::registry::entry");
         if (!set_entry(interp, name, entry, errPtr)) {
             free(name);
             return 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100227/b38304f4/attachment.html>