!120 Fix the problem of displaying none in the interface version information

From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-12-23 08:47:43 +00:00 committed by Gitee
commit 049905b6ae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From 1cc7cdb36a52cb242c14e503e8b8b186b3d495d4 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 23 Dec 2022 16:10:47 +0800
Subject: [PATCH] Fix the problem of displaying none in the interface version
information
---
shell/ukccabout.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/shell/ukccabout.cpp b/shell/ukccabout.cpp
index 547d6f3..371fccf 100644
--- a/shell/ukccabout.cpp
+++ b/shell/ukccabout.cpp
@@ -99,7 +99,7 @@ QString UkccAbout::getUkccVersion() {
char *q = NULL;
QString version = "none";
- pp = popen("dpkg -l ukui-control-center | grep ukui-control-center", "r");
+ pp = popen("rpm -q ukui-control-center", "r");
if(NULL == pp)
return version;
@@ -108,12 +108,12 @@ QString UkccAbout::getUkccVersion() {
*q = '\0';
QString content = line;
- QStringList list = content.split(" ");
+ QStringList list = content.split("-");
list.removeAll("");
if (list.size() >= 3)
- version = list.at(2);
+ version = list.at(3);
}
free(line);
--
2.33.0

View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: ukui-control-center
Version: 3.1.2
Release: 4
Release: 5
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-compile-error-of-ukui-control-center.patch
Patch02: 0001-modify-version-info-error.patch
Patch03: 0003-fix-power-missing-issue.patch
Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version-information.patch
BuildRequires: qt5-qtsvg-devel
BuildRequires: gsettings-qt-devel
@ -120,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Dec 23 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-5
- add patch5: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version-information.patch
* Thu Dec 15 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-4
- fix power missing issue