git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be1560a
)
bugfix, scanning native_methods needs to start in installed dir, not '.'
author
parmentelat
<thierry.parmentelat@inria.fr>
Wed, 23 May 2018 08:29:11 +0000
(10:29 +0200)
committer
parmentelat
<thierry.parmentelat@inria.fr>
Wed, 23 May 2018 08:29:11 +0000
(10:29 +0200)
PLC/Methods/__init__.py
patch
|
blob
|
history
diff --git
a/PLC/Methods/__init__.py
b/PLC/Methods/__init__.py
index
000edba
..
9b6645b
100644
(file)
--- 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
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 tha
t
needed
+# like `make sync` we can easily end up with more files tha
n
needed
# which breaks in production
contents = [
# which breaks in production
contents = [
@@
-18,8
+18,9
@@
contents = [
]
for dir, pattern in 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 == '.' \
for match in matches:
filename = match[prefix:][:-3]
python_name = filename if dir == '.' \