Skip to content

be more robust when removing download artifacts and remove bogus raise s... #10464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2013
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/etc/snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,11 @@ def get_url_to_file(u,f):
returncode = subprocess.call(["wget", "-O", tmpf, u])

if returncode != 0:
os.unlink(tmpf)
raise
try:
os.unlink(tmpf)
except OSError as e:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the as e? It's unused here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to check that the errno was ENONET, but later decided it wasn't worth it.

pass
raise Exception("failed to fetch url")
os.rename(tmpf, f)

def snap_filename_hash_part(snap):
Expand Down