Otto

Merge lp:~fginther/otto/fix-iso-file-format into lp:otto

  1. fix-iso-file-format
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Merged at revision: 261
Proposed branch: lp:~fginther/otto/fix-iso-file-format
Merge into: lp:otto
Diff against target: 11 lines (+1/-0)
1 file modified
ottolib/utils.py (+1/-0)
To merge this branch: bzr merge lp:~fginther/otto/fix-iso-file-format
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+198460@code.launchpad.net

Commit message

Add 'x86 boot sector' as a valid image type: 'iso9660'.

Description of the change

Add 'x86 boot sector' as a valid image type: 'iso9660'.

This was tested on one of the failing trusty otto hosts:
ubuntu@dx-autopilot-nvidia:/tmp/fginther/fix-iso-file-format/ottolib$ python
Python 2.7.6 (default, Dec 8 2013, 09:05:38)
[GCC 4.8.2] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import utils
>>> utils.get_image_type("/tmp/fginther/trusty-desktop-i386.iso")
'iso9660'

ubuntu@dx-autopilot-nvidia:/tmp/fginther/fix-iso-file-format/ottolib$ file /tmp/fginther/trusty-desktop-i386.iso
/tmp/fginther/trusty-desktop-i386.iso: x86 boot sector

To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Looks good. Thanks.

I verified the behaviour of file against several ISO on my machine and it obviously changed. Only lucid ISO are still reported as ISO 9660 CDROM Filesystem.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ottolib/utils.py'
2--- ottolib/utils.py 2013-06-04 13:32:35 +0000
3+++ ottolib/utils.py 2013-12-10 21:17:11 +0000
4@@ -168,6 +168,7 @@
5 # signature -> type
6 imgtypes = {
7 "# ISO 9660 CD-ROM filesystem": "iso9660",
8+ "x86 boot sector": "iso9660",
9 "Squashfs filesystem": "squashfs"
10 }
11 if not os.path.isfile(path):

Subscribers

People subscribed via source and target branches