[84481] trunk/base/src

[jmr at macports.org]

Revision: 84481
          http://trac.macports.org/changeset/84481
Author:   jmr at macports.org
Date:     2011-09-26 10:11:16 -0700 (Mon, 26 Sep 2011)
Log Message:
-----------
allow epoch to be a don't care value in reg_entry_open by passing an empty string

Modified Paths:
--------------
    trunk/base/src/cregistry/entry.c
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/cregistry/entry.c
===================================================================
--- trunk/base/src/cregistry/entry.c	2011-09-26 16:51:27 UTC (rev 84480)
+++ trunk/base/src/cregistry/entry.c	2011-09-26 17:11:16 UTC (rev 84481)
@@ -262,8 +262,14 @@
         char* revision, char* variants, char* epoch, reg_error* errPtr) {
     sqlite3_stmt* stmt = NULL;
     reg_entry* entry = NULL;
-    char* query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
+    char* query;
+    if (strlen(epoch) > 0) {
+        query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
         "AND revision=? AND variants=? AND epoch=?";
+    } else {
+        query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
+        "AND revision=? AND variants=? AND epoch!=?";
+    }
     if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
             && (sqlite3_bind_text(stmt, 1, name, -1, SQLITE_STATIC)
                 == SQLITE_OK)

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2011-09-26 16:51:27 UTC (rev 84480)
+++ trunk/base/src/port1.0/portutil.tcl	2011-09-26 17:11:16 UTC (rev 84481)
@@ -1511,7 +1511,7 @@
             ui_debug "Skipping $target ($subport) since this port is already installed"
             return 0
         } elseif {$target == "activate"} {
-            set regref [registry_open $subport $version $revision $portvariants $epoch]
+            set regref [registry_open $subport $version $revision $portvariants ""]
             if {[registry_prop_retr $regref active] != 0} {
                 # Something to close the registry entry may be called here, if it existed.
                 ui_debug "Skipping $target ($subport @${version}_${revision}${portvariants}) since this port is already active"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110926/f8770ea6/attachment.html>