From 8b8669269759703135b8332e3d7885bf75e7d6b2 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 11:14:47 +0900 Subject: [PATCH] Imported Upstream version 16.1.3 Change-Id: I5ae53ab88508be9b8441c7a22a7cfd806945319a Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ zypp/misc/CheckAccessDeleted.cc | 16 +++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index db4b959..8068003 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "1") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # -# LAST RELEASED: 16.1.2 (0) +# LAST RELEASED: 16.1.3 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index e2adff4..c958b52 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 14 19:02:57 CEST 2016 - ma@suse.de + +- use more user friendly command names for "zypper ps" (bsc#980541) +- version 16.1.3 (0) + +------------------------------------------------------------------- Thu Jul 14 15:39:03 CEST 2016 - ma@suse.de - Don't do media number substitution on URLs of medium #1 (bsc#798470) diff --git a/zypp/misc/CheckAccessDeleted.cc b/zypp/misc/CheckAccessDeleted.cc index de705bd..eeafb9d 100644 --- a/zypp/misc/CheckAccessDeleted.cc +++ b/zypp/misc/CheckAccessDeleted.cc @@ -81,21 +81,15 @@ namespace zypp case 'L': pinfo.login = &*(ch+1); break; - case 'c': - pinfo.command = &*(ch+1); - break; } if ( *ch == '\n' ) break; // end of data do { ++ch; } while ( *ch != '\0' ); // skip to next field } - if ( pinfo.command.size() == 15 ) - { - // the command name might be truncated, so we check against /proc//exe - Pathname command( filesystem::readlink( Pathname("/proc")/pinfo.pid/"exe" ) ); - if ( ! command.empty() ) - pinfo.command = command.basename(); - } + // the command name might be truncated, so we check against /proc//exe + Pathname command( filesystem::readlink( Pathname("/proc")/pinfo.pid/"exe" ) ); + if ( ! command.empty() ) + pinfo.command = command.basename(); //MIL << " Take " << pinfo << endl; } @@ -208,7 +202,7 @@ namespace zypp static const char* argv[] = { - "lsof", "-n", "-FpcuLRftkn0", NULL + "lsof", "-n", "-FpuLRftkn0", NULL }; ExternalProgram prog( argv, ExternalProgram::Discard_Stderr ); -- 2.7.4