fix #651794 - incorrect exit code of fuser -m -s
This commit is contained in:
parent
48ba284462
commit
f2fa38f6d3
19
psmisc-22.13-fuser-silent.patch
Normal file
19
psmisc-22.13-fuser-silent.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/src/fuser.c b/src/fuser.c
|
||||||
|
index 4688dfe..d19075a 100644
|
||||||
|
--- a/src/fuser.c
|
||||||
|
+++ b/src/fuser.c
|
||||||
|
@@ -1112,7 +1112,13 @@ print_matches(struct names *names_head, const opt_type opts,
|
||||||
|
|
||||||
|
for (nptr = names_head; nptr != NULL; nptr = nptr->next) {
|
||||||
|
if (opts & OPT_SILENT) {
|
||||||
|
- have_match = nptr->matched_procs ? 1 : have_match;
|
||||||
|
+ for (pptr = nptr->matched_procs; pptr != NULL;
|
||||||
|
+ pptr = pptr->next) {
|
||||||
|
+ if(pptr->proc_type != PTYPE_NORMAL)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ have_match = 1;
|
||||||
|
+ }
|
||||||
|
} else { /* We're not silent */
|
||||||
|
if ((opts & OPT_ALLFILES) == 0) {
|
||||||
|
name_has_procs = 0;
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Utilities for managing processes on your system
|
Summary: Utilities for managing processes on your system
|
||||||
Name: psmisc
|
Name: psmisc
|
||||||
Version: 22.13
|
Version: 22.13
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||||
@ -14,6 +14,7 @@ BuildRequires: ncurses-devel
|
|||||||
BuildRequires: autoconf automake
|
BuildRequires: autoconf automake
|
||||||
|
|
||||||
Patch1: psmisc-22.13-peekfd-segv.patch
|
Patch1: psmisc-22.13-peekfd-segv.patch
|
||||||
|
Patch2: psmisc-22.13-fuser-silent.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The psmisc package contains utilities for managing processes on your
|
The psmisc package contains utilities for managing processes on your
|
||||||
@ -27,6 +28,7 @@ of processes that are using specified files or filesystems.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --prefix=%{_prefix} --enable-selinux
|
%configure --prefix=%{_prefix} --enable-selinux
|
||||||
@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc AUTHORS ChangeLog COPYING README
|
%doc AUTHORS ChangeLog COPYING README
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 16 2010 Jan Görig <jgorig@redhat.com> 22.13-5
|
||||||
|
- fix #651794 - incorrect exit code of fuser -m -s
|
||||||
|
|
||||||
* Tue Oct 19 2010 Dan Horák <dan[at]danny.cz> 22.13-4
|
* Tue Oct 19 2010 Dan Horák <dan[at]danny.cz> 22.13-4
|
||||||
- peekfd still exists only on selected architectures
|
- peekfd still exists only on selected architectures
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user