Merge pull request #464 from jeroenooms/solaris

hadley · hadley · commit 8d0ccd11ddf8 · 2016-04-22T14:35:21.000-05:00
fix for solaris
diff --git a/R/compare-time.R b/R/compare-time.R
@@ -26,7 +26,7 @@ compare.POSIXt <- function(x, y, tolerance = 0.001, ..., max_diffs = 9) {
 }
 
 standardise_tzone <- function(x) {
-  if (is.null(attr(x, "tzone"))) {
+  if (is.null(attr(x, "tzone")) || identical(attr(x, "tzone"), Sys.timezone())) {
     attr(x, "tzone") <- ""
   }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ compare.POSIXt <- function(x, y, tolerance = 0.001, ..., max_diffs = 9) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`standardise_tzone <- function(x) {`
`29`		`- if (is.null(attr(x, "tzone"))) {`
	`29`	`+ if (is.null(attr(x, "tzone")) \|\| identical(attr(x, "tzone"), Sys.timezone())) {`
`30`	`30`	`attr(x, "tzone") <- ""`
`31`	`31`	`}`
`32`	`32`