Merge ubiquity:wip/handle-no-zfs-option into ubiquity:master

Proposed by Iain Lane on 2019-10-08
Status: Merged
Approved by: Jean-Baptiste Lallement on 2019-10-08
Approved revision: 13c261000f627c0f7cb2921586d9bc72636a2914
Merged at revision: e18a2fefe4536c3a14f26317085721baee63014f
Proposed branch: ubiquity:wip/handle-no-zfs-option
Merge into: ubiquity:master
Diff against target: 24 lines (+8/-5)
1 file modified
ubiquity/plugins/ubi-partman.py (+8/-5)
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement 2019-10-08 Approve on 2019-10-08
Review via email: mp+373812@code.launchpad.net
To post a comment you must log in.
Jean-Baptiste Lallement (jibel) wrote :

LGTM. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubiquity/plugins/ubi-partman.py b/ubiquity/plugins/ubi-partman.py
2index e0607cd..a1f731d 100644
3--- a/ubiquity/plugins/ubi-partman.py
4+++ b/ubiquity/plugins/ubi-partman.py
5@@ -3259,11 +3259,14 @@ class Page(plugin.Plugin):
6 self.preseed_as_c(self.current_question, autopartition_choice,
7 seen=False)
8 telemetry_method = method
9- if self.ui.use_zfs.get_active() and method == 'use_device':
10- self.db.set('ubiquity/use_zfs', 'true')
11- telemetry_method = "use_zfs"
12- else:
13- self.db.set('ubiquity/use_zfs', 'false')
14+ try:
15+ if self.ui.use_zfs.get_active() and method == 'use_device':
16+ telemetry_method = "use_zfs"
17+ except AttributeError: # zfs not implemented on this frontend
18+ pass
19+
20+ self.db.set('ubiquity/use_zfs',
21+ 'true' if telemetry_method == 'use_zfs' else 'false')
22 telemetry.get().set_partition_method(telemetry_method)
23 # Don't exit partman yet.
24 else:

Subscribers

People subscribed via source and target branches