Backport.

Fix bug reported on user list: the path variable here was undefined,
causing a failure when running outside the user tree. This was my
fault: when I refactored this routine, I failed to note that this
variable was now undefined.

(cherry picked from commit 72c2a72afd3ddadbbd00de68bbb01ac04f71399b)

diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index 4d10cb641713b29d184979ef7eab27b13a273b95..77b16faa8fc62173639d3d1fa23c1a21f82d59c6 100755 (executable)
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
@@ -174,7 +174,7 @@ def gather_files(curfile, incfiles, lyx2lyx):
     return 0
 
 
-def find_lyx2lyx(progloc):
+def find_lyx2lyx(progloc, path):
     " Find a usable version of the lyx2lyx script. "
     # first we will see if the script is roughly where we are
     # i.e., we will assume we are in $SOMEDIR/scripts and look
@@ -275,7 +275,7 @@ def main(args):
     path = string.split(os.environ["PATH"], os.pathsep)
 
     if lyx2lyx == None:
-        lyx2lyx = find_lyx2lyx(ourprog)
+        lyx2lyx = find_lyx2lyx(ourprog, path)
 
     # Initialize the list with the specified LyX file and recursively
     # gather all required files (also from child documents).

diff --git a/status.20x b/status.20x
index 8d3600f542be63c165691dc91a9f9f8206f20c65..5adafb593fce9f09977a0e41094aad7395ff52d6 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -71,6 +71,9 @@ What's new
 - Layout file for JASATeX: solved problems with natbib and added missing
   short title for the document title
 
+- Fix problem using lyxpak.py when outside the LyX tree: Variable was
+  undefined.
+
 
 * USER INTERFACE