UTAH

Merge lp:~javier.collado/utah/bug1043174 into lp:utah

  1. bug1043174
  2. Merge into dev
Proposed by Javier Collado
Status: Merged
Merged at revision: 664
Proposed branch: lp:~javier.collado/utah/bug1043174
Merge into: lp:utah
Diff against target: 17 lines (+2/-2)
1 file modified
utah/iso.py (+2/-2)
To merge this branch: bzr merge lp:~javier.collado/utah/bug1043174
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+121853@code.launchpad.net

Description of the change

This branch checks for both 'casper' and './casper' to detect desktop installs

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Looks good to me. I imagine this will improve compatibility if the iso gets built differently.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/iso.py'
2--- utah/iso.py 2012-08-24 18:26:16 +0000
3+++ utah/iso.py 2012-08-29 12:43:25 +0000
4@@ -184,11 +184,11 @@
5 If ubuntu-server.seed exists in the preseeds directory, it's server.
6 """
7 self.logger.info('Getting image type of ' + self.image)
8- files = self.listfiles(returnlist=True)
9+ files = set(self.listfiles(returnlist=True))
10 installtype = 'alternate'
11 if '.disk/mini-info' in files:
12 installtype = 'mini'
13- elif './casper' in files:
14+ elif 'casper' in files or './casper' in files:
15 installtype = 'desktop'
16 elif './preseed/ubuntu-server.seed' in files:
17 installtype = 'server'

Subscribers

People subscribed via source and target branches