[sosi2osm] 05/19: improved lua-patch

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository sosi2osm.

commit c7753f126d25e96830b4407da112cdff2b4ae3b6
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Jul 7 16:28:41 2014 +0200

    improved lua-patch
---
 debian/patches/find_lua_files.patch | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/patches/find_lua_files.patch b/debian/patches/find_lua_files.patch
index 8052393..643b6f0 100644
--- a/debian/patches/find_lua_files.patch
+++ b/debian/patches/find_lua_files.patch
@@ -9,13 +9,27 @@
      
      int r = luaL_loadfile(state, library_filename);
      if (r) {
-@@ -48,8 +48,11 @@ void loadLua(char* filename) {
+@@ -46,10 +46,23 @@ void loadLua(char* filename) {
+     }
+     lua_call(state, 0, 0);
      
-     r = luaL_loadfile(state, filename);
-     if (r) {
+-    r = luaL_loadfile(state, filename);
+-    if (r) {
 -        fprintf(stderr, "Failed to load lua file %s\n", filename);
 -        exit(1);
++    FILE *file;
++    if((file = fopen(filename, "r")))
++    {
++        fclose(file);
++        r = luaL_loadfile(state, filename);
++        if(r) {
++            fprintf(stderr, "Failed to load lua file %s\n", filename);
++            exit(1);
++        }
++    }
++    else {
 +        snprintf(library_filename, 256, "/usr/share/sosi2osm/lua/%s",filename);
++        r = luaL_loadfile(state, library_filename);
 +        if(r) {
 +            fprintf(stderr, "Failed to load lua file %s\n", filename);
 +            exit(1);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sosi2osm.git