Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2020-11-13 18:56:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings" Fri Nov 13 18:56:17 2020 rev:214 rq:845662 version:4.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2020-10-18 16:20:47.564474039 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new.24930/yast2-pkg-bindings.changes 2020-11-13 18:56:44.357955284 +0100 @@ -1,0 +2,7 @@ +Tue Nov 3 08:53:18 UTC 2020 - Ladislav Slezák <[email protected]> + +- Add a hint to the "locked" error message + (gh#yast/yast-yast2#1102) +- 4.3.4 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-4.3.3.tar.bz2 New: ---- yast2-pkg-bindings-4.3.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.42rL9I/_old 2020-11-13 18:56:47.077958437 +0100 +++ /var/tmp/diff_new_pack.42rL9I/_new 2020-11-13 18:56:47.081958442 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 4.3.3 +Version: 4.3.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.42rL9I/_old 2020-11-13 18:56:47.109958474 +0100 +++ /var/tmp/diff_new_pack.42rL9I/_new 2020-11-13 18:56:47.113958479 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.3.3 +Version: 4.3.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-4.3.3.tar.bz2 -> yast2-pkg-bindings-4.3.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.3/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-4.3.4/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-4.3.3/package/yast2-pkg-bindings-devel-doc.spec 2020-10-09 15:14:14.000000000 +0200 +++ new/yast2-pkg-bindings-4.3.4/package/yast2-pkg-bindings-devel-doc.spec 2020-11-03 10:53:05.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.3/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-4.3.4/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-4.3.3/package/yast2-pkg-bindings.changes 2020-10-09 15:14:14.000000000 +0200 +++ new/yast2-pkg-bindings-4.3.4/package/yast2-pkg-bindings.changes 2020-11-03 10:53:05.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 3 08:53:18 UTC 2020 - Ladislav Slezák <[email protected]> + +- Add a hint to the "locked" error message + (gh#yast/yast-yast2#1102) +- 4.3.4 + +------------------------------------------------------------------- Mon Oct 5 08:27:39 UTC 2020 - [email protected] - Added new call Pkg::SetAdditionalVendors (jsc#SLE-15184). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.3/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-4.3.4/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-4.3.3/package/yast2-pkg-bindings.spec 2020-10-09 15:14:14.000000000 +0200 +++ new/yast2-pkg-bindings-4.3.4/package/yast2-pkg-bindings.spec 2020-11-03 10:53:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.3.3 +Version: 4.3.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-4.3.3/src/PkgFunctions.cc new/yast2-pkg-bindings-4.3.4/src/PkgFunctions.cc --- old/yast2-pkg-bindings-4.3.3/src/PkgFunctions.cc 2020-10-09 15:14:14.000000000 +0200 +++ new/yast2-pkg-bindings-4.3.4/src/PkgFunctions.cc 2020-11-03 10:53:05.000000000 +0100 @@ -181,8 +181,18 @@ } 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) { _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
