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
Léo-Paul Géneau
slapos.core
Commits
be2b2ac7
Commit
be2b2ac7
authored
Jun 27, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SlapObject: removed useless try..finally blocks
parent
3cc4ecb3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
slapos/grid/SlapObject.py
slapos/grid/SlapObject.py
+4
-10
No files found.
slapos/grid/SlapObject.py
View file @
be2b2ac7
...
...
@@ -131,12 +131,8 @@ class Software(object):
# Check if we can download from cache
if
(
not
os
.
path
.
exists
(
self
.
software_path
)
and
self
.
download_binary_cache
(
tarpath
)):
tar
=
tarfile
.
open
(
tarpath
)
try
:
self
.
logger
.
info
(
"Extracting archive of cached software release..."
)
tar
.
extractall
(
path
=
self
.
software_root
)
finally
:
tar
.
close
()
tarfile
.
open
(
tarpath
).
extractall
(
self
.
software_root
)
else
:
self
.
_install_from_buildout
()
self
.
update_binary_cache
(
tarpath
)
...
...
@@ -241,9 +237,7 @@ class Software(object):
"""
self
.
logger
.
info
(
"Creating archive of software release..."
)
tar
=
tarfile
.
open
(
tarpath
,
"w:gz"
)
try
:
tar
.
add
(
self
.
software_path
,
arcname
=
self
.
software_url_hash
)
finally
:
tar
.
close
()
self
.
logger
.
info
(
"Trying to upload archive of software release..."
)
upload_network_cached
(
...
...
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