From: parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 23 May 2018 08:29:11 +0000 (+0200)
Subject: bugfix, scanning native_methods needs to start in installed dir, not '.'
X-Git-Tag: plcapi-5.4-2~8
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=24f0a4528061afbca3299e92005bb19e631b323a

bugfix, scanning native_methods needs to start in installed dir, not '.'
---

diff --git a/PLC/Methods/__init__.py b/PLC/Methods/__init__.py
index 000edba..9b6645b 100644
--- a/PLC/Methods/__init__.py
+++ b/PLC/Methods/__init__.py
@@ -9,7 +9,7 @@ native_methods = []
 toppath = os.path.dirname(__file__)
 
 # do not blindly scan this directory, as when using devel tools
-# like `make sync` we can easily end up with more files that needed
+# like `make sync` we can easily end up with more files than needed
 # which breaks in production
 
 contents = [
@@ -18,8 +18,9 @@ contents = [
 ]
 
 for dir, pattern in contents:
-    prefix = len(dir) + 1
-    matches = glob.glob("{}/{}".format(dir, pattern))
+    matches = glob.glob("{}/{}/{}".format(toppath, dir, pattern))
+    # count 2 slashes
+    prefix = len(toppath) + 1 + len(dir) + 1
     for match in matches:
         filename = match[prefix:][:-3]
         python_name = filename if dir == '.' \