Add a hint to the "locked" error message (gh#yast/yast-yast2#1102)

- 4.3.4
yast · Nov 3, 2020 · e680d59 · e680d59
1 parent 7be3473
commit e680d59
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-pkg-bindings-devel-doc
-Version:        4.3.3
+Version:        4.3.4
 Release:        0
 License:        GPL-2.0-only
 Group:          Documentation/HTML

diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov  3 08:53:18 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
+
+- Add a hint to the "locked" error message
+  (gh#yast/yast-yast2#1102)
+- 4.3.4
+
 -------------------------------------------------------------------
 Mon Oct  5 08:27:39 UTC 2020 - schubi@suse.de
 

diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        4.3.3
+Version:        4.3.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/PkgFunctions.cc b/src/PkgFunctions.cc
@@ -181,8 +181,18 @@ PkgFunctions::Connect()
     }
     catch(const zypp::ZYppFactoryException &excpt)
     {
-	y2error("Error in Connect: FactoryException: %s", excpt.asString().c_str());
-	_last_error.setLastError(excpt.asString());
+        std::string msg(excpt.asString());
+        y2error("Error in Connect: FactoryException: %s", msg.c_str());
+
+        // running "/usr/bin/ruby.ruby2.5" application is not a good hint for users,
+        // very likely it is another YaST instance already running,
+        // add a hint to the error message from libzypp
+        if (excpt.lockerName().find("ruby") != std::string::npos)
+        {
+            msg += std::string("\n\n") + _("Maybe another YaST application is already running?");
+        }
+
+        _last_error.setLastError(msg);
     }
     catch (const zypp::Exception& excpt)
     {