ubiquity

Merge lp:~ev/ubiquity/956531 into lp:ubiquity

  1. 956531
  2. Merge into trunk
Proposed by Evan
Status: Merged
Merged at revision: 5267
Proposed branch: lp:~ev/ubiquity/956531
Merge into: lp:ubiquity
Diff against target: 35 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
ubiquity/plugins/ubi-partman.py (+2/-2)
To merge this branch: bzr merge lp:~ev/ubiquity/956531
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+98203@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

ubiquity/plugins/ubi-partman.py:215: subprocess.call(['umount', mount_path])
ubiquity/plugins/ubi-partman.py:2080: subprocess.call(['umount', mount_path])

Maybe worth doing this change in both places?

lp:~ev/ubiquity/956531 updated
5267. By Evan

Lazily unmount partitions in the check for a Windows partition to
install Wubi on when we have a full partition table (LP: #956531).

5268. By Evan

Fix accidental messing up of this branch.

5269. By Evan

Also umount lazily when putting the wubi binary on the Windows partition.

Revision history for this message
Evan (ev) wrote :

Done.

Revision history for this message
Colin Watson (cjwatson) wrote :

Looks good to me - feel free to merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-15 22:12:58 +0000
3+++ debian/changelog 2012-03-19 14:45:23 +0000
4@@ -1,3 +1,10 @@
5+ubiquity (2.9.30) UNRELEASED; urgency=low
6+
7+ * Lazily unmount partitions in the check for a Windows partition to
8+ install Wubi on when we have a full partition table (LP: #956531).
9+
10+ -- Evan Dandrea <ev@ubuntu.com> Mon, 19 Mar 2012 14:23:32 +0000
11+
12 ubiquity (2.9.29) precise; urgency=low
13
14 [ Oliver Grawert ]
15
16=== modified file 'ubiquity/plugins/ubi-partman.py'
17--- ubiquity/plugins/ubi-partman.py 2012-03-15 16:15:21 +0000
18+++ ubiquity/plugins/ubi-partman.py 2012-03-19 14:45:23 +0000
19@@ -212,7 +212,7 @@
20 except subprocess.CalledProcessError:
21 pass
22 finally:
23- subprocess.call(['umount', mount_path])
24+ subprocess.call(['umount', '-l', mount_path])
25 if os.path.exists(mount_path):
26 os.rmdir(mount_path)
27
28@@ -2077,7 +2077,7 @@
29 except subprocess.CalledProcessError:
30 pass
31 finally:
32- subprocess.call(['umount', mount_path])
33+ subprocess.call(['umount', '-l', mount_path])
34 if os.path.exists(mount_path):
35 os.rmdir(mount_path)
36

Subscribers

People subscribed via source and target branches

to status/vote changes: