diff -Naurp pcp-3.11.3.orig/qa/006.out pcp-3.11.3/qa/006.out
--- pcp-3.11.3.orig/qa/006.out 2016-05-23 14:59:11.000000000 +1000
+++ pcp-3.11.3/qa/006.out 2016-08-05 15:09:10.008021649 +1000
@@ -57,7 +57,7 @@ QA output created by 006
-12400 Bad input to pmstore
-12401 Archives overlap in time
-12402 Archives differ by host
--12403 Archives differ by time zone
+-12403 No such PMAPI error code (-12403)
-12404 The type of a metric has changed in an archive
-12405 The semantics of a metric has changed in an archive
-12406 The instance domain of a metric has changed in an archive
diff -Naurp pcp-3.11.3.orig/src/include/pcp/pmapi.h pcp-3.11.3/src/include/pcp/pmapi.h
--- pcp-3.11.3.orig/src/include/pcp/pmapi.h 2016-05-25 09:37:12.000000000 +1000
+++ pcp-3.11.3/src/include/pcp/pmapi.h 2016-08-05 15:09:10.009021635 +1000
@@ -189,7 +189,7 @@ typedef struct pmDesc {
#define PM_ERR_BADSTORE (-PM_ERR_BASE-55) /* Bad input to pmstore */
#define PM_ERR_LOGOVERLAP (-PM_ERR_BASE-56) /* Archives overlap in time */
#define PM_ERR_LOGHOST (-PM_ERR_BASE-57) /* Archives differ by host */
-#define PM_ERR_LOGTIMEZONE (-PM_ERR_BASE-58) /* Archives differ in time zone */
+ /* retired PM_ERR_LOGTIMEZONE (-PM_ERR_BASE-58) Archives differ in time zone */
#define PM_ERR_LOGCHANGETYPE (-PM_ERR_BASE-59) /* The type of a metric has changed in an archive */
#define PM_ERR_LOGCHANGESEM (-PM_ERR_BASE-60) /* The semantics of a metric has changed in an archive */
#define PM_ERR_LOGCHANGEINDOM (-PM_ERR_BASE-61) /* The instance domain of a metric has changed in an archive */
diff -Naurp pcp-3.11.3.orig/src/libpcp/src/err.c pcp-3.11.3/src/libpcp/src/err.c
--- pcp-3.11.3.orig/src/libpcp/src/err.c 2016-05-23 14:59:11.000000000 +1000
+++ pcp-3.11.3/src/libpcp/src/err.c 2016-08-05 15:09:10.009021635 +1000
@@ -154,8 +154,6 @@ static const struct {
"Archives overlap in time" },
{ PM_ERR_LOGHOST, "PM_ERR_LOGHOST",
"Archives differ by host" },
- { PM_ERR_LOGTIMEZONE, "PM_ERR_LOGTIMEZONE",
- "Archives differ by time zone" },
{ PM_ERR_LOGCHANGETYPE, "PM_ERR_LOGCHANGETYPE",
"The type of a metric has changed in an archive" },
{ PM_ERR_LOGCHANGESEM, "PM_ERR_LOGCHANGESEM",
diff -Naurp pcp-3.11.3.orig/src/libpcp/src/logutil.c pcp-3.11.3/src/libpcp/src/logutil.c
--- pcp-3.11.3.orig/src/libpcp/src/logutil.c 2016-05-16 16:42:00.000000000 +1000
+++ pcp-3.11.3/src/libpcp/src/logutil.c 2016-08-05 15:09:10.008021649 +1000
@@ -108,12 +108,10 @@ checkLabelConsistency (__pmContext *ctxp
* When checking for consistency, it is sufficient to check vs the
* first archive in the context.
* The version number is checked by __pmLogChkLabel.
- * Check the hostname and the time zone.
+ * Check the hostname.
*/
if (strcmp(lp->ill_hostname, ctxp->c_archctl->ac_log_list[0]->ml_hostname) != 0)
return PM_ERR_LOGHOST;
- if (strcmp(lp->ill_tz, ctxp->c_archctl->ac_log_list[0]->ml_tz) != 0)
- return PM_ERR_LOGTIMEZONE;
/* All is ok */
return 0;