From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sun, 12 Dec 2010 21:09:53 +0000 (+0000)
Subject: Do not use the --vanilla option of Rscript, since it can
X-Git-Tag: 2.0.0~1396
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8c6ce6359523dfc97d9722446c86f6252efdb9e7;p=features.git

Do not use the --vanilla option of Rscript, since it can
cause unexpected errors (like locally installed packages
not found).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36849 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/configure.py b/lib/configure.py
index 23766eb4b1..0eed65206e 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -626,7 +626,7 @@ def checkConverterEntries():
         rc_entry = [r'''\converter literate   latex      "%%"	""
 \converter literate   pdflatex      "%%"	""'''])
     #
-    checkProg('a Sweave -> LaTeX converter', ['Rscript --vanilla $$s/scripts/lyxsweave.R $$i $$e'],
+    checkProg('a Sweave -> LaTeX converter', ['Rscript --no-save --no-restore $$s/scripts/lyxsweave.R $$i $$e $$r'],
         rc_entry = [r'''\converter sweave   latex      "%%"	""
 \converter sweave   pdflatex      "%%"	""'''])
     #