diff options
author | Scott Moser <smoser@ubuntu.com> | 2012-11-07 10:23:32 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2012-11-07 10:23:32 -0500 |
commit | 8ada8c1f625be5365a5116c458476c7deeae8818 (patch) | |
tree | a2f3b4c968a3fd4cbc76ad59ce70563485ea8171 /cloudinit/sources/DataSourceOVF.py | |
parent | 0da58fe113726c7654bca54b365d95044b44ef87 (diff) | |
parent | ce5a554672f4ffbc383af08a35d22a1dd89ce41f (diff) | |
download | vyos-cloud-init-8ada8c1f625be5365a5116c458476c7deeae8818.tar.gz vyos-cloud-init-8ada8c1f625be5365a5116c458476c7deeae8818.zip |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceOVF.py')
-rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index 771e64eb..e90150c6 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -204,9 +204,8 @@ def transport_iso9660(require_iso=True): try: # See if we can read anything at all...?? - with open(fullp, 'rb') as fp: - fp.read(512) - except: + util.peek_file(fullp, 512) + except IOError: continue try: |