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
Łukasz Nowak
slapos.toolbox
Commits
624ac647
Commit
624ac647
authored
Feb 13, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug where software_type of main instance is *impossible* to set reliably
parent
88c95b9f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
slapos/runner/utils.py
slapos/runner/utils.py
+6
-3
No files found.
slapos/runner/utils.py
View file @
624ac647
...
@@ -19,6 +19,8 @@ from flask import jsonify
...
@@ -19,6 +19,8 @@ from flask import jsonify
import
slapos.slap
import
slapos.slap
# Global variable
global_software_type
=
'default'
# Setup default flask (werkzeug) parser
# Setup default flask (werkzeug) parser
...
@@ -105,8 +107,9 @@ def requestInstance(config, software_type=None):
...
@@ -105,8 +107,9 @@ def requestInstance(config, software_type=None):
"""
"""
Request the main instance of our environment
Request the main instance of our environment
"""
"""
if
not
software_type
:
if
software_type
:
software_type
=
None
global
global_software_type
global_software_type
=
software_type
slap
=
slapos
.
slap
.
slap
()
slap
=
slapos
.
slap
.
slap
()
profile
=
getCurrentSoftwareReleaseProfile
(
config
)
profile
=
getCurrentSoftwareReleaseProfile
(
config
)
...
@@ -122,7 +125,7 @@ def requestInstance(config, software_type=None):
...
@@ -122,7 +125,7 @@ def requestInstance(config, software_type=None):
profile
,
profile
,
partition_reference
=
getSoftwareReleaseName
(
config
),
partition_reference
=
getSoftwareReleaseName
(
config
),
partition_parameter_kw
=
partition_parameter_kw
,
partition_parameter_kw
=
partition_parameter_kw
,
software_type
=
software_type
,
software_type
=
global_
software_type
,
filter_kw
=
None
,
filter_kw
=
None
,
state
=
None
,
state
=
None
,
shared
=
False
)
shared
=
False
)
...
...
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