Changeset 32198

Timestamp:

Aug 25, 2011, 4:34:26 PM (15 years ago)

Author:

bills

Message:

from trunk. disttool -revertrun was only acting on the last label in the list

Location:

tags/ipp-20110622/ippTools/src

Files:

• disttool.c (modified) (1 diff, 1 prop)
• disttoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-20110622/ippTools/src/disttool.c

@@ -771 +771 @@
     PXOPT_COPY_S64(config->args, where, "-stage_id", "stage_id", "==");
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "distRun.label", "==");
 
     PXOPT_COPY_S16(config->args, where,  "-fault", "distRun.fault", "==");

tags/ipp-20110622/ippTools/src/disttoolConfig.c

@@ -105 +105 @@
     psMetadataAddS64(revertrunArgs, PS_LIST_TAIL, "-stage_id", 0, "define stage_id", 0);
     psMetadataAddStr(revertrunArgs, PS_LIST_TAIL, "-state",    0, "define state", NULL);
-    psMetadataAddStr(revertrunArgs, PS_LIST_TAIL, "-label",    0, "define label", NULL);
+    psMetadataAddStr(revertrunArgs, PS_LIST_TAIL, "-label",    PS_META_DUPLICATE_OK, "define label", NULL);
     psMetadataAddS16(revertrunArgs, PS_LIST_TAIL, "-fault", 0, "define fault code", 0);
     psMetadataAddBool(revertrunArgs, PS_LIST_TAIL, "-all",    0, "revert all faulted runs", NULL);