Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
3a02076d
Commit
3a02076d
authored
Jul 10, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply patch so that slapos.cookbook can work both in linux and cygwin
parent
e71e8957
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
slapos/recipe/librecipe/execute.py
slapos/recipe/librecipe/execute.py
+2
-1
slapos/recipe/librecipe/inotify.py
slapos/recipe/librecipe/inotify.py
+2
-1
slapos/recipe/lockfile.py
slapos/recipe/lockfile.py
+2
-1
No files found.
slapos/recipe/librecipe/execute.py
View file @
3a02076d
...
@@ -43,7 +43,8 @@ def _wait_files_creation(file_list):
...
@@ -43,7 +43,8 @@ def _wait_files_creation(file_list):
directories
[
dirname
][
event
.
name
]
=
True
directories
[
dirname
][
event
.
name
]
=
True
finally
:
finally
:
os
.
close
(
fd
)
if
isinstance
(
fd
,
int
):
os
.
close
(
fd
)
def
execute
(
args
):
def
execute
(
args
):
"""Portable execution with process replacement"""
"""Portable execution with process replacement"""
...
...
slapos/recipe/librecipe/inotify.py
View file @
3a02076d
...
@@ -48,4 +48,5 @@ def subfiles(directory):
...
@@ -48,4 +48,5 @@ def subfiles(directory):
subfiles
=
[
file_
.
name
for
file_
in
inotifyx
.
get_events
(
watchfd
)]
subfiles
=
[
file_
.
name
for
file_
in
inotifyx
.
get_events
(
watchfd
)]
finally
:
finally
:
os
.
close
(
watchfd
)
if
isinstance
(
watchfd
,
int
):
os
.
close
(
watchfd
)
slapos/recipe/lockfile.py
View file @
3a02076d
...
@@ -57,7 +57,8 @@ class LockFile(object):
...
@@ -57,7 +57,8 @@ class LockFile(object):
except
IOError
:
# add_watch failed
except
IOError
:
# add_watch failed
pass
pass
finally
:
finally
:
os
.
close
(
inotify_fd
)
if
isinstance
(
inotify_fd
,
int
):
os
.
close
(
inotify_fd
)
self
.
__enter__
()
self
.
__enter__
()
...
...
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