← Back to branch summary

~didrocks/ubiquity/intall-metrics

« back to all changes in this revision

Viewing changes to ubiquity/plugins/ubi-usersetup.py

  • Committer: Jean-Baptiste Lallement
  • Date: 2018-02-28 14:58:37 UTC
  • mfrom: (6588.1.3 ubiquity)
  • Revision ID: jean-baptiste.lallement@ubuntu.com-20180228145837-abkjlk4vvb92o1gs
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. Thanks seb128!

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubiquity/plugins/ubi-usersetup.py
186
186
        self.password = builder.get_object('password')
187
187
        self.verified_password = builder.get_object('verified_password')
188
188
        self.login_auto = builder.get_object('login_auto')
189
 
        self.login_encrypt = builder.get_object('login_encrypt')
190
189
        self.login_pass = builder.get_object('login_pass')
191
190
        self.username_error_label = builder.get_object('username_error_label')
192
191
        self.hostname_error_label = builder.get_object('hostname_error_label')
262
261
        return self.login_auto.get_active()
263
262
 
264
263
    def set_encrypt_home(self, value):
265
 
        self.login_encrypt.set_active(value)
 
264
        print('Ecryptfs is deprecated')
266
265
 
267
266
    def set_force_encrypt_home(self, value):
268
 
        self.login_vbox.set_sensitive(not value)
 
267
        print('Ecryptfs is deprecated')
269
268
 
 
269
    # Ecryptfs is deprecated
270
270
    def get_encrypt_home(self):
271
 
        return self.login_encrypt.get_active()
 
271
        return False
272
272
 
273
273
    def username_error(self, msg):
274
274
        self.username_ok.hide()
429
429
        else:
430
430
            self.resolver_ok = False
431
431
 
432
 
    def on_authentication_toggled(self, w):
433
 
        if w == self.login_auto and w.get_active():
434
 
            self.login_encrypt.set_active(False)
435
 
        elif w == self.login_encrypt and w.get_active():
436
 
            # TODO why is this so slow to activate the login_pass radio button
437
 
            # when checking encrypted home?
438
 
            self.login_pass.set_active(True)
439
 
 
440
432
 
441
433
class PageKde(PageBase):
442
434
    plugin_breadcrumb = 'ubiquity/text/breadcrumb_user'
652
644
        return self.auto_login
653
645
 
654
646
    def set_encrypt_home(self, value):
655
 
        self.encrypt_home = value
 
647
        print('Ecryptfs is deprecated')
656
648
 
657
649
    def set_force_encrypt_home(self, value):
658
 
        self.set_encrypt_home(value)
 
650
        print('Ecryptfs is deprecated')
659
651
 
 
652
    # Ecrypts is deprecated
660
653
    def get_encrypt_home(self):
661
 
        return self.encrypt_home
 
654
        return False
662
655
 
663
656
    def username_error(self, msg):
664
657
        """The selected username was bad."""