optimization the patch
This commit is contained in:
parent
002b3ad58b
commit
c0eb229f18
41
anaconda-skip-checks-if-no-username-is-set.patch
Normal file
41
anaconda-skip-checks-if-no-username-is-set.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
From b30a435ce81526e07af1bd83f4afe0e472c054bb Mon Sep 17 00:00:00 2001
|
||||||
|
From: fanghuiyu <fanghuiyu@huawei.com>
|
||||||
|
Date: Mon, 30 Sep 2019 16:46:54 +0800
|
||||||
|
Subject: [PATCH] anaconda: skip checks if no username is set
|
||||||
|
|
||||||
|
reason: skip checks if no username is set
|
||||||
|
|
||||||
|
Change-Id: Ia18055e17b4014be05eef3b3f9175b5df635a1a5
|
||||||
|
Signed-off-by: fanghuiyu <fanghuiyu@huawei.com>
|
||||||
|
---
|
||||||
|
pyanaconda/ui/gui/spokes/user.py | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
|
||||||
|
index f2fd63a..54525e2 100644
|
||||||
|
--- a/pyanaconda/ui/gui/spokes/user.py
|
||||||
|
+++ b/pyanaconda/ui/gui/spokes/user.py
|
||||||
|
@@ -312,6 +312,9 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
|
||||||
|
self._validity_check.result.status_text_changed.connect(self.set_password_status)
|
||||||
|
# check if the password contains non-ascii characters
|
||||||
|
self._ascii_check = input_checking.PasswordASCIICheck()
|
||||||
|
+ # Skip the empty and validity password checks if no username is set
|
||||||
|
+ self._empty_check.skip = True
|
||||||
|
+ self._validity_check.skip = True
|
||||||
|
|
||||||
|
# register the individual checks with the checker in proper order
|
||||||
|
# 0) is the username and fullname valid ?
|
||||||
|
@@ -474,9 +477,9 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
|
||||||
|
self.password_confirmation_entry.set_sensitive(password_is_required)
|
||||||
|
|
||||||
|
# also disable/enable corresponding password checks
|
||||||
|
- self._empty_check.skip = not password_is_required
|
||||||
|
+ self._empty_check.skip = not password_is_required or not self.username
|
||||||
|
self._confirm_check.skip = not password_is_required
|
||||||
|
- self._validity_check.skip = not password_is_required
|
||||||
|
+ self._validity_check.skip = not password_is_required or not self.username
|
||||||
|
self._ascii_check.skip = not password_is_required
|
||||||
|
|
||||||
|
# and rerun the checks
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: anaconda
|
Name: anaconda
|
||||||
Version: 29.24.7
|
Version: 29.24.7
|
||||||
Release: 21
|
Release: 22
|
||||||
Summary: Graphical system installer
|
Summary: Graphical system installer
|
||||||
License: GPLv2+ and MIT
|
License: GPLv2+ and MIT
|
||||||
URL: https://fedoraproject.org/wiki/Anaconda
|
URL: https://fedoraproject.org/wiki/Anaconda
|
||||||
@ -43,6 +43,7 @@ Patch9025: bugfix-for-encrypting-partion.patch
|
|||||||
Patch9026: bugfix-modify-arguments-parsing.patch
|
Patch9026: bugfix-modify-arguments-parsing.patch
|
||||||
Patch9027: anaconda-add-boot-options-for-raid-3408.patch
|
Patch9027: anaconda-add-boot-options-for-raid-3408.patch
|
||||||
Patch9028: anaconda-add-kdump-parameter-into-kernel-cmdline.patch
|
Patch9028: anaconda-add-kdump-parameter-into-kernel-cmdline.patch
|
||||||
|
Patch9029: anaconda-skip-checks-if-no-username-is-set.patch
|
||||||
|
|
||||||
BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17
|
BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17
|
||||||
BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel
|
BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel
|
||||||
@ -53,7 +54,7 @@ BuildRequires: libtimezonemap-devel >= 0.4.1-2 libxml2
|
|||||||
|
|
||||||
Requires: anaconda-core = %{version}-%{release}
|
Requires: anaconda-core = %{version}-%{release}
|
||||||
Requires: anaconda-tui = %{version}-%{release}
|
Requires: anaconda-tui = %{version}-%{release}
|
||||||
Requires: udisks2-iscsi libblockdev-plugins-all realmd isomd5sum kexec-tools
|
Requires: libblockdev-plugins-all realmd isomd5sum kexec-tools
|
||||||
Requires: createrepo_c tmux gdb rsync python3-meh-gui adwaita-icon-theme dracut-live
|
Requires: createrepo_c tmux gdb rsync python3-meh-gui adwaita-icon-theme dracut-live
|
||||||
Requires: tigervnc-server-minimal libxklavier libgnomekbd libtimezonemap xz
|
Requires: tigervnc-server-minimal libxklavier libgnomekbd libtimezonemap xz
|
||||||
Requires: nm-connection-editor keybinder3 anaconda-user-help yelp system-logos
|
Requires: nm-connection-editor keybinder3 anaconda-user-help yelp system-logos
|
||||||
@ -215,6 +216,9 @@ update-desktop-database &> /dev/null || :
|
|||||||
%{_datadir}/gtk-doc
|
%{_datadir}/gtk-doc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-22
|
||||||
|
- optimization the patch
|
||||||
|
|
||||||
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-21
|
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-21
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user