Context Navigation

chiptool.c

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

Property svn:mergeinfo changed

/branches/bills_branches/bills_201312 (added)	merged: 36383,36386,36388-36396,36406-36407,36409-36412,36415-36420,36422-36427,36433,36436-36439
/tags/ipp-20140114 (added)	merged: 36444-36446,36448,36450
/trunk (added)	merged: 36397,36403-36404,36413,36421,36428-36431,36434-36435,36441,36447,36452-36457,36459,36463,36476-36478

Property svn:ignore

Property svn:mergeinfo changed
/branches/bills_branches/bills_201312/ippTools/src (added) merged: 36386,36392,36395,36409,36411,36417,36437
/trunk/ippTools/src (added) merged: 36431,36441,36455

-              r35789
+              r36480
     psMetadata *where = psMetadataAlloc();
     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "chipRun.label", "==");
     psString query = pxDataGet("chiptool_pendingcleanuprun.sql");
 …
+    }
     psFree(where);
+    psStringAppend(&query, "\nORDER BY priority DESC, chip_id");
     // treat limit == 0 as "no limit"

Note: See TracChangeset for help on using the changeset viewer.

/branches/bills_branches/bills_201312/ippTools/src (added)	merged: 36386,36392,36395,36409,36411,36417,36437
/trunk/ippTools/src (added)	merged: 36431,36441,36455