rpms/diffutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed sdiff exit code handling (bug #152967).

Browse Source
This commit is contained in:
Tim Waugh 2005-04-06 15:37:02 +00:00
parent 7c5b45c886
commit 5fd287d3c8
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
diffutils-sdiff.patch Normal file
View File

@ -0,0 +1,12 @@
--- diffutils-2.8.1/src/sdiff.c.sdiff 2005-04-06 14:59:26.000000000 +0100
+++ diffutils-2.8.1/src/sdiff.c 2005-04-06 15:02:36.000000000 +0100
@@ -724,7 +724,8 @@
if (! interact_ok)
exiterr ();
- ck_editor_status (werrno, wstatus);
+ if (!WIFEXITED(wstatus))
+ ck_editor_status (werrno, wstatus);
untrapsig (0);
checksigs ();
exit (WEXITSTATUS (wstatus));

5
diffutils.spec
View File

@ -11,6 +11,7 @@ Source3: diff3.1
Source4: sdiff.1 Source4: sdiff.1
Patch0: diffutils-2.8.4-i18n.patch Patch0: diffutils-2.8.4-i18n.patch
Patch1: diffutils-2.8.1-badc.patch Patch1: diffutils-2.8.1-badc.patch
Patch2: diffutils-sdiff.patch
License: GPL License: GPL
Prefix: %{_prefix} Prefix: %{_prefix}
Prereq: /sbin/install-info Prereq: /sbin/install-info
@ -33,6 +34,7 @@ Install diffutils if you need to compare text files.
%setup -q %setup -q
%patch0 -p1 -b .i18n %patch0 -p1 -b .i18n
%patch1 -p1 -b .badc %patch1 -p1 -b .badc
%patch2 -p1 -b .sdiff
%build %build
%configure %configure
@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/diff.info*gz %{_infodir}/diff.info*gz
%changelog %changelog
* Wed Apr 6 2005 Tim Waugh <twaugh@redhat.com>
- Fixed sdiff exit code handling (bug #152967).
* Wed Mar 2 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-14 * Wed Mar 2 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-14
- Rebuild for new GCC. - Rebuild for new GCC.