The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 4f65cfbd5f18912ebd36f0cda4cb9ca0045ff980 Author: Richard Heck <[email protected]> Date: Tue Nov 27 20:50:09 2012 -0500 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 4d10cb6..77b16fa 100755 --- 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 8d3600f..5adafb5 100644 --- 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 ----------------------------------------------------------------------- Summary of changes: lib/scripts/lyxpak.py | 4 ++-- status.20x | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
