!6 modify arguments parsing

Merge pull request !6 from t.feng/master
This commit is contained in:
openeuler-ci-bot 2020-01-09 10:07:30 +08:00 committed by Gitee
commit a03a4f7020
2 changed files with 34 additions and 2 deletions

View File

@ -3,7 +3,7 @@
Name: anaconda
Version: 29.24.7
Release: 18
Release: 19
Summary: Graphical system installer
License: GPLv2+ and MIT
URL: https://fedoraproject.org/wiki/Anaconda
@ -40,6 +40,7 @@ Patch9022: anaconda-modify-interface-is-extended-in-Chinese-mod.patch
Patch9023: bugfix-fix-vender-issue.patch
Patch9024: bugfix-disable-adding-virtual-device-in-network-spokes.patch
Patch9025: bugfix-for-encrypting-partion.patch
Patch9026: bugfix-modify-arguments-parsing.patch
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
@ -212,7 +213,13 @@ update-desktop-database &> /dev/null || :
%{_datadir}/gtk-doc
%changelog
* Wed Feb 1 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-18
* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-19
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:modify arguments parsing
* Wed Jan 1 2020 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-18
- Type:bugfix
- ID:NA
- SUG:NA

View File

@ -0,0 +1,25 @@
From 638d318636727fd20c48d354f21ff67c3cf28238 Mon Sep 17 00:00:00 2001
From: fengtao <fengtao40@huawei.com>
Date: Wed, 8 Jan 2020 09:57:37 +0800
Subject: [PATCH] modify arguments parsing
---
pyanaconda/argument_parsing.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/argument_parsing.py b/pyanaconda/argument_parsing.py
index b7b1777..1a7f418 100644
--- a/pyanaconda/argument_parsing.py
+++ b/pyanaconda/argument_parsing.py
@@ -588,7 +588,7 @@ def getArgumentParser(version_string, boot_cmdline=None):
# some defaults change based on cmdline flags
if boot_cmdline is not None:
- if "console" in boot_cmdline:
+ if "console" in boot_cmdline and "inst.text" in boot_cmdline:
ap.set_defaults(display_mode=DisplayModes.TUI)
return ap
--
1.8.3.1