Merge pull request #335 from RcppCore/bugfix/setwd-on-exit-in-sourceCpp

jjallaire · jjallaire · commit d6803468fa50 · 2015-08-03T06:03:54.000-04:00
very simple fix for #309
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-02  Dirk Eddelbuettel  <edd@debian.org>
+
+        * R/Attributes.R (sourceCpp): In no-rebuild-needed case, also set a
+        default directory restoration via on.exit()
+
 2015-07-24  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION: Release 0.12.0
diff --git a/R/Attributes.R b/R/Attributes.R
@@ -153,6 +153,10 @@ sourceCpp <- function(file = "",
         }
     }
     else {
+        cwd <- getwd()
+        on.exit({
+            setwd(cwd)
+        })
         if (verbose)
             cat("\nNo rebuild required (use rebuild = TRUE to ",
                 "force a rebuild)\n\n", sep="")

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2015-08-02  Dirk Eddelbuettel  <[email protected]>
++
 +        * R/Attributes.R (sourceCpp): In no-rebuild-needed case, also set a
 +        default directory restoration via on.exit()
++
 -07-24  Dirk Eddelbuettel  <[email protected]>
         * DESCRIPTION: Release 0.12.0
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,10 @@ sourceCpp <- function(file = "",`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`else {`
	`156`	`+ cwd <- getwd()`
	`157`	`+ on.exit({`
	`158`	`+ setwd(cwd)`
	`159`	`+ })`
`156`	`160`	`if (verbose)`
`157`	`161`	`cat("\nNo rebuild required (use rebuild = TRUE to ",`
`158`	`162`	`"force a rebuild)\n\n", sep="")`