Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Fachschaftsrat Physik TUKL
Protokoll
protokoll_skript
Commits
b6f498ee
Verified
Commit
b6f498ee
authored
Mar 06, 2019
by
Lorenz Steinert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
always return normpath
parent
71ee1c11
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
bin/module/esme.py
bin/module/esme.py
+3
-5
No files found.
bin/module/esme.py
View file @
b6f498ee
...
...
@@ -327,12 +327,11 @@ def get_share(rundir, config=None, sharedir=None):
if
os
.
path
.
isdir
(
config_share
)
and
os
.
path
.
isabs
(
config_share
):
return
config
[
'PROTOKOLL'
][
'share'
]
elif
os
.
path
.
isdir
(
os
.
path
.
join
(
rundir
,
'..'
,
config_share
)):
print
(
os
.
path
.
normpath
(
os
.
path
.
join
(
rundir
,
'..'
,
config_share
)))
return
os
.
path
.
normpath
(
os
.
path
.
join
(
rundir
,
'..'
,
config_share
))
logging
.
warning
(
config_share
+
': Not a Directory'
)
return
Error
.
NO_DIR
elif
os
.
path
.
isdir
(
os
.
path
.
join
(
rundir
,
'../share'
)):
return
os
.
path
.
join
(
rundir
,
'../share'
)
return
os
.
path
.
normpath
(
os
.
path
.
join
(
rundir
,
'../share'
)
)
logging
.
warning
(
'No share Directory found at '
+
os
.
path
.
abspath
(
os
.
path
.
join
(
rundir
,
'../share'
)))
return
Error
.
NO_DEFAULT_DIR
...
...
@@ -350,14 +349,13 @@ def get_path(rundir, config=None, path=None):
if
os
.
path
.
isdir
(
config_path
)
and
os
.
path
.
isabs
(
config_path
):
return
config_path
elif
os
.
path
.
isdir
(
os
.
path
.
join
(
rundir
,
'..'
,
config_path
)):
print
(
os
.
path
.
normpath
(
os
.
path
.
join
(
rundir
,
'..'
,
config_path
)))
return
os
.
path
.
normpath
(
os
.
path
.
join
(
rundir
,
'..'
,
config_path
))
logging
.
warning
(
config
[
'PROTOKOLL'
][
'path'
]
+
': Not a Directory'
)
return
Error
.
NO_DIR
elif
os
.
path
.
isdir
(
os
.
path
.
join
(
rundir
,
'../..'
)):
return
os
.
path
.
join
(
rundir
,
'../..'
)
return
os
.
path
.
normpath
(
os
.
path
.
join
(
rundir
,
'../..'
)
)
logging
.
warning
(
'No Protokoll Directory found at '
+
os
.
path
.
abs
path
(
os
.
path
.
join
(
rundir
,
'../..'
)))
+
os
.
path
.
norm
path
(
os
.
path
.
join
(
rundir
,
'../..'
)))
return
Error
.
NO_DEFAULT_DIR
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment