summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceOVF.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2012-10-23 18:58:32 +0200
committerScott Moser <smoser@brickies.net>2012-10-23 18:58:32 +0200
commit71b4108d029fff61ff8183ffbd77917569bea2cd (patch)
tree6564cd3f5faa26fb1c843b14d27ca6eaa23164f0 /cloudinit/sources/DataSourceOVF.py
parentcb5893c3e3f635de4fef86f0a19be0ada0054930 (diff)
parente8a10a41d22876d555084def823817337d9c2a80 (diff)
downloadvyos-cloud-init-71b4108d029fff61ff8183ffbd77917569bea2cd.tar.gz
vyos-cloud-init-71b4108d029fff61ff8183ffbd77917569bea2cd.zip
use only util methods for reading/loading/appending/peeking
Use only util methods for reading/loading/appending/peeking at files since it is likely soon that we will add a new way of adjusting the root of files read, also it is useful for debugging to track what is being read/written in a central fashion.
Diffstat (limited to 'cloudinit/sources/DataSourceOVF.py')
-rw-r--r--cloudinit/sources/DataSourceOVF.py5
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: