Changeset 27071

Timestamp:

Feb 24, 2010, 5:10:55 PM (16 years ago)

Author:

Paul Price

Message:

Allowing revert to have multiple labels provided, for use in an automatic manner within pantasks.

Location:

trunk/ippTools/src

Files:

• pubtool.c (modified) (2 diffs)
• pubtoolConfig.c (modified) (1 diff)

trunk/ippTools/src/pubtool.c

@@ -157 +157 @@
     // optional
     PXOPT_COPY_S64(config->args, where, "-client_id", "client_id", "==");
-    pxAddLabelSearchArgs (config, where, "-label", "label", "=="); // define using newExp label
+    pxAddLabelSearchArgs(config, where, "-label", "label", "=="); // define using newExp label
 
     psString query = pxDataGet("pubtool_definerun.sql"); // Query to run
@@ -355 +355 @@
     PXOPT_COPY_STR(config->args, where, "-client_id", "publishClient.client_id", "==");
     PXOPT_COPY_STR(config->args, where, "-comment", "publishClient.comment", "LIKE");
-    PXOPT_COPY_STR(config->args, where, "-label", "publishRun.label", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "publishRun.label", "==");
 
     psString query = pxDataGet("pubtool_revert.sql");

trunk/ippTools/src/pubtoolConfig.c

@@ -88 +88 @@
     psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-client_id", 0, "search on client_id", NULL);
     psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-comment", 0, "search on comment (LIKE)", NULL);
-    psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-label", 0, "search on label", NULL);
+    psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on label", NULL);