!4 fix setup bug

Merge pull request !4 from openeuler-basic/init
This commit is contained in:
freesky-edward 2019-12-30 17:07:50 +08:00 committed by Gitee
commit a46159de28
2 changed files with 13 additions and 5 deletions

View File

@ -3,7 +3,7 @@
Name: anaconda
Version: 29.24.7
Release: 16
Release: 17
Summary: Graphical system installer
License: GPLv2+ and MIT
URL: https://fedoraproject.org/wiki/Anaconda
@ -211,6 +211,12 @@ update-desktop-database &> /dev/null || :
%{_datadir}/gtk-doc
%changelog
* Mon Dec 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-17
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:bugfix in setup
* Mon Dec 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 29.24.7-16
- Type:bugfix
- ID:NA

View File

@ -1,12 +1,14 @@
diff -uNrp a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
diff -urNp a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
--- a/pyanaconda/ui/gui/spokes/network.py 2018-07-25 21:58:20.000000000 +0800
+++ b/pyanaconda/ui/gui/spokes/network.py 2019-12-30 11:17:45.001615749 +0800
@@ -878,8 +878,7 @@ class NetworkControlBox(GObject.GObject)
+++ b/pyanaconda/ui/gui/spokes/network.py 2019-12-30 16:58:36.337887175 +0800
@@ -877,9 +877,8 @@ class NetworkControlBox(GObject.GObject)
unplugged)
if dev_cfg.device:
title += '\n<span size="small">%s %s</span>' % \
- title += '\n<span size="small">%s %s</span>' % \
- (escape_markup(dev_cfg.device.get_vendor() or ""),
- escape_markup(dev_cfg.device.get_product() or ""))
+ title += '\n<span size="small">%s</span>' % \
+ (escape_markup(dev_cfg.device.get_product() or ""))
return title