Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
slapos.toolbox
Commits
85af0022
Commit
85af0022
authored
Apr 29, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: do not retunr a bool when you are supposed to return a string
runner: realpath return a string
parent
9b8c2bf2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
slapos/runner/utils.py
slapos/runner/utils.py
+5
-4
No files found.
slapos/runner/utils.py
View file @
85af0022
...
@@ -142,8 +142,9 @@ def getCurrentSoftwareReleaseProfile(config):
...
@@ -142,8 +142,9 @@ def getCurrentSoftwareReleaseProfile(config):
os
.
path
.
join
(
config
[
'etc_dir'
],
".project"
)).
read
()
os
.
path
.
join
(
config
[
'etc_dir'
],
".project"
)).
read
()
return
realpath
(
return
realpath
(
config
,
os
.
path
.
join
(
software_folder
,
config
[
'software_profile'
]))
config
,
os
.
path
.
join
(
software_folder
,
config
[
'software_profile'
]))
# XXXX No Comments
except
:
except
:
return
False
return
''
def
requestInstance
(
config
,
software_type
=
None
):
def
requestInstance
(
config
,
software_type
=
None
):
...
@@ -753,7 +754,7 @@ def realpath(config, path, check_exist=True):
...
@@ -753,7 +754,7 @@ def realpath(config, path, check_exist=True):
'
software_link
': config['
software_link
']
'
software_link
': config['
software_link
']
}
}
if key not in allow_list:
if key not in allow_list:
return
False
return
''
del split_path[0]
del split_path[0]
path = os.path.join(allow_list[key], *split_path)
path = os.path.join(allow_list[key], *split_path)
...
@@ -761,7 +762,7 @@ def realpath(config, path, check_exist=True):
...
@@ -761,7 +762,7 @@ def realpath(config, path, check_exist=True):
if os.path.exists(path):
if os.path.exists(path):
return path
return path
else:
else:
return
False
return
''
else:
else:
return path
return path
...
@@ -798,7 +799,7 @@ def isSoftwareReleaseReady(config):
...
@@ -798,7 +799,7 @@ def isSoftwareReleaseReady(config):
auto_deploy = config['
auto_deploy
'] in TRUE_VALUES
auto_deploy = config['
auto_deploy
'] in TRUE_VALUES
auto_run = config['
autorun
'] in TRUE_VALUES
auto_run = config['
autorun
'] in TRUE_VALUES
project = os.path.join(config['
etc_dir
'], '
.
project
')
project = os.path.join(config['
etc_dir
'], '
.
project
')
if not ( os.path.exists(project)
or auto_run or auto_deploy
):
if not ( os.path.exists(project)
and (auto_run or auto_deploy)
):
return "0"
return "0"
path = open(project, 'r').readline().strip()
path = open(project, 'r').readline().strip()
software_name = path
software_name = path
...
...
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