rpms/psmisc/devel psmisc-22.6-twoerr.patch, NONE, 1.1 psmisc.spec, 1.56, 1.57

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/psmisc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30287

Modified Files:
	psmisc.spec 
Added Files:
	psmisc-22.6-twoerr.patch 
Log Message:
fix #588322


psmisc-22.6-twoerr.patch:
 fuser.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE psmisc-22.6-twoerr.patch ---
diff -up psmisc-22.6/src/fuser.c.twoerr psmisc-22.6/src/fuser.c
--- psmisc-22.6/src/fuser.c.twoerr	2010-05-05 13:41:01.000000000 +0200
+++ psmisc-22.6/src/fuser.c	2010-05-05 13:43:01.000000000 +0200
@@ -818,8 +818,8 @@ int main(int argc, char *argv[])
 				break;
 			default: /* FILE */
 				this_name->filename = strdup(argv[optc]);
-					parse_file(this_name, &match_inodes);
-					parse_unixsockets(this_name, &match_inodes, unixsockets);
+					if( parse_file(this_name, &match_inodes) == 0 )
+					    parse_unixsockets(this_name, &match_inodes, unixsockets);
 				if (opts & OPT_MOUNTPOINT || opts & OPT_MOUNTS)
 					parse_mounts(this_name, &match_devices, opts);
 				break;


Index: psmisc.spec
===================================================================
RCS file: /cvs/extras/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- psmisc.spec	4 Aug 2009 23:50:56 -0000	1.56
+++ psmisc.spec	18 May 2010 12:13:52 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 22.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Patch1: psmisc-22.6-pstree-overflow.patc
 #fix #497303
 Patch2: psmisc-22.6-fuser-remove-mountlist.patch
 Patch3: psmisc-22.6-overflow2.patch
+Patch4: psmisc-22.6-twoerr.patch
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -35,6 +36,7 @@ of processes that are using specified fi
 %patch1 -p1 -b .overflow
 %patch2 -p1 -b .mount
 %patch3 -p1 -b .overflow2
+%patch4 -p1 -b .twoerr
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue May 18 2010 Daniel Novotny <dnovotny at redhat.com> 22.6-14
+- fix #588322 - fuser'ing a non-existent file yields two error messages
+
 * Wed Aug 05 2009 Lubomir Rintel <lkundrak at v3.sk> - 22.6-13
 - Fix a buffer overflow