!35 [sync] PR-33: fix share error of peony

From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-06-09 00:42:38 +00:00 committed by Gitee
commit 3fe82bb783
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From cd35751b5c23c0ed0b2e81026619fd2750ad19d9 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 6 Jun 2023 17:26:46 +0800
Subject: [PATCH] fix share error of peony
---
libpeony-qt/usershare-manager.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libpeony-qt/usershare-manager.cpp b/libpeony-qt/usershare-manager.cpp
index 48c719d..0849dc7 100644
--- a/libpeony-qt/usershare-manager.cpp
+++ b/libpeony-qt/usershare-manager.cpp
@@ -84,8 +84,9 @@ QString UserShareInfoManager::exectueCommand (QStringList& args, bool* retb /* o
proc.open();
// Check whether sambashare exists and contains the current user
- QProcess::execute ("bash pkexec /usr/bin/peony-share.sh", QStringList() << g_get_user_name () << sharedPath);
-
+ QString cmdtest = QString("pkexec /usr/bin/peony-share.sh %1 %2").arg(g_get_user_name()).arg(sharedPath);
+ QProcess::execute (cmdtest);
+
// Shared folder
args.prepend ("net");
proc.start("bash");
--
2.33.0

View File

@ -1,10 +1,11 @@
Name: peony
Version: 3.10.0
Release: 2
Release: 3
Summary: file Manager for the UKUI desktop
License: GPL-3.0-or-later and MIT and BSD-3-Clause
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-share-error-of-peony.patch
BuildRequires: libudisks2-devel
BuildRequires: libnotify-devel
@ -77,6 +78,7 @@ Provides: libpeony
%prep
%setup -q
%patch01 -p1
%build
%{qmake_qt5}
@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/%{_lib}/*.so
%changelog
* Tue Jun 06 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.0-3
- fix share error of peony
* Tue Feb 07 2023 peijiankang <peijiankang@kylinos.cn> - 3.10.0-2
- add build debuginfo and debugsource