Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Gabriel Monnerat
slapos.core
Commits
5a4bd503
Commit
5a4bd503
authored
Aug 03, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflict between develop and only_cp
parent
61f94127
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+2
-1
No files found.
slapos/grid/slapgrid.py
View file @
5a4bd503
...
@@ -610,7 +610,8 @@ class Slapgrid(object):
...
@@ -610,7 +610,8 @@ class Slapgrid(object):
instance_path
=
os
.
path
.
join
(
instance_path
=
os
.
path
.
join
(
self
.
instance_root
,
computer_partition_id
)
self
.
instance_root
,
computer_partition_id
)
timestamp_path
=
os
.
path
.
join
(
instance_path
,
'.timestamp'
)
timestamp_path
=
os
.
path
.
join
(
instance_path
,
'.timestamp'
)
if
(
not
self
.
develop
)
and
os
.
path
.
exists
(
timestamp_path
):
if
computer_partition_id
not
in
self
.
computer_partition_filter_list
and
\
(
not
self
.
develop
)
and
os
.
path
.
exists
(
timestamp_path
):
old_timestamp
=
open
(
timestamp_path
).
read
()
old_timestamp
=
open
(
timestamp_path
).
read
()
parameter_dict
=
computer_partition
.
getInstanceParameterDict
()
parameter_dict
=
computer_partition
.
getInstanceParameterDict
()
if
'timestamp'
in
parameter_dict
:
if
'timestamp'
in
parameter_dict
:
...
...
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