Author: mlandres Date: Mon Jul 14 13:38:26 2008 New Revision: 10572 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10572&view=rev Log: Also report the name of the locking process in ZYppFactoryException Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ZYppFactory.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10572&r1=10571&r2=10572&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Jul 14 13:38:26 2008 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Jul 14 13:36:26 CEST 2008 - ma@suse.de + +- Also report the name of the locking process in ZYppFactoryException + (bnc #280537) +- revision 10572 + +------------------------------------------------------------------- +Mon Jul 14 13:31:28 CEST 2008 - ma@suse.de + +- Provide also the name of the locking process in + ZYppFactoryException () +- revision 10571 + +------------------------------------------------------------------- Mon Jul 14 11:26:30 CEST 2008 - schubi@suse.de - corrected logging onf solver settings Modified: trunk/libzypp/zypp/ZYppFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppFactory.cc?rev=10572&r1=10571&r2=10572&view=diff ============================================================================== --- trunk/libzypp/zypp/ZYppFactory.cc (original) +++ trunk/libzypp/zypp/ZYppFactory.cc Mon Jul 14 13:38:26 2008 @@ -89,13 +89,19 @@ catch(...) {} // let no exception escape. } - pid_t locker_pid() const { return _locker_pid; } + pid_t locker_pid() const + { return _locker_pid; } + + const std::string & locker_name() const + { return _locker_name; } + bool _clean_lock; private: FILE *_zypp_lockfile; pid_t _locker_pid; + std::string _locker_name; void openLockFile(const char *mode) { @@ -174,7 +180,8 @@ if ( still_running ) { Pathname p( procdir/"exe" ); - MIL << p << " -> " << filesystem::readlink( p ) << endl; + _locker_name = filesystem::readlink( p ).asString(); + MIL << p << " -> " << _locker_name << endl; p = procdir/"cmdline"; MIL << p << ": "; @@ -351,9 +358,11 @@ /*--------------------------------------------------*/ if ( globalLock.zyppLocked() ) { - std::string t = str::form(N_("System management is locked by the application with pid %d. " + std::string t = str::form(N_("System management is locked by the application with pid %d (%s). " "Please close this application before trying again."), - globalLock.locker_pid()); + globalLock.locker_pid(), + globalLock.locker_name().c_str() + ); ZYPP_THROW(ZYppFactoryException(t, globalLock.locker_pid())); } else -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org