Merge lp://staging/~seb128/ubiquity/remove-ecryptfs-option into lp://staging/ubiquity

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 6589
Proposed branch: lp://staging/~seb128/ubiquity/remove-ecryptfs-option
Merge into: lp://staging/ubiquity
Diff against target: 311 lines (+18/-151)
10 files modified
autopilot/ubiquity-autopilot-runner/jenkins/config/ubuntu.cfg (+0/-1)
autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py (+0/-1)
autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py (+0/-27)
autopilot/ubiquity_autopilot_tests/tests/__init__.py (+1/-5)
autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_home.py (+0/-65)
debian/changelog (+8/-0)
debian/control (+1/-1)
gui/gtk/stepUserInfo.ui (+0/-24)
tests/test_usersetup.py (+0/-11)
ubiquity/plugins/ubi-usersetup.py (+8/-16)
To merge this branch: bzr merge lp://staging/~seb128/ubiquity/remove-ecryptfs-option
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+340026@code.staging.launchpad.net

Commit message

Remove the encrypted userdir option from the gtk installer since
ecryptfs is going to move to universe. The keep the base code in case
the option is added back later using another technology.

Description of the change

Remove the encrypted userdir option from the gtk installer since
ecryptfs is going to move to universe. The keep the base code in case
the option is added back later using another technology.

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

Thanks for this update.

The object login_encrypt has been removed from the page of the GTK frontend (and initialized to None in the page's constructor) but is still used in ubi-usersetup in on_authentication_toggled(). Ubiquity crashes when the user selects auto-login.

review: Needs Fixing
6590. By Sebastien Bacher

Don't use the deleted object and remove the corresponding callback

6591. By Sebastien Bacher

Remove the corresponding autopilot reference

Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for catching that, I remove that callback/widget and the corresponding autopilot reference

Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

pep8 tests are failing:
ubiquity/plugins/ubi-usersetup.py:432:1: E302 expected 2 blank lines, found 1
autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py:273:1: E302 expected 2 blank lines, found 1

Unit tests are failing:
test_interface_translated (test_gtkui.TestFrontend) ... Exception in GTK frontend (invoking crash handler):
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 103, in _builder_connect_callback
    handler, args = _extract_handler_and_args(obj_or_map, handler_name)
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 83, in _extract_handler_and_args
    raise AttributeError('Handler %s not found' % handler_name)
AttributeError: Handler on_authentication_toggled not found

Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 103, in _builder_connect_callback
    handler, args = _extract_handler_and_args(obj_or_map, handler_name)
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 83, in _extract_handler_and_args
    raise AttributeError('Handler %s not found' % handler_name)
AttributeError: Handler on_authentication_toggled not found

review: Needs Fixing
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

This diff fixes the build:
=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py 2018-02-28 11:45:21 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py 2018-02-28 14:19:21 +0000
@@ -270,6 +270,7 @@
         else:
             return False

+
 class GtkAlignment(GtkContainers):
     """ Emulator class for a GtkAlignment instance """
     def __init__(self, *args):

=== modified file 'gui/gtk/stepUserInfo.ui'
--- gui/gtk/stepUserInfo.ui 2018-02-27 14:28:33 +0000
+++ gui/gtk/stepUserInfo.ui 2018-02-28 14:22:16 +0000
@@ -88,7 +88,6 @@
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">login_pass</property>
- <signal name="clicked" handler="on_authentication_toggled" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py 2018-02-28 11:41:07 +0000
+++ ubiquity/plugins/ubi-usersetup.py 2018-02-28 14:19:09 +0000
@@ -429,6 +429,7 @@
         else:
             self.resolver_ok = False

+
 class PageKde(PageBase):
     plugin_breadcrumb = 'ubiquity/text/breadcrumb_user'

Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

with the changes above applied, it builds successfully and manual verification shows that the "encrypt home directory" option is gone and installation is successful.

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: