RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 27-Jan-2011 18:29:47
Branch: rpm-5_4 Handle: 2011012717294502
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio rpmsq.c
Log:
fix return code for ignored signals breaking ie. rpmbuild with
gnome-terminal (mdvbz#62262)
Summary:
Revision Changes Path
1.3501.2.53 +2 -0 rpm/CHANGES
1.42.6.1 +1 -1 rpm/rpmio/rpmsq.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.52 -r1.3501.2.53 CHANGES
--- rpm/CHANGES 27 Jan 2011 01:09:58 -0000 1.3501.2.52
+++ rpm/CHANGES 27 Jan 2011 17:29:45 -0000 1.3501.2.53
@@ -1,4 +1,6 @@
5.4.0 -> 5.4.1:
+ - proyvind: fix return code for ignored signals breaking ie. rpmbuild
with
+ gnome-terminal (mdvbz#62262)
- proyvind: add tools/dbconvert for rpmdb conversion to/from hash/btree &
little/big endian (to handle upgrade/downgrade to/from older rpm
versions)
- jbj: remove fsync(2) after file install, its intolerably slow.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsq.c
============================================================================
$ cvs diff -u -r1.42 -r1.42.6.1 rpmsq.c
--- rpm/rpmio/rpmsq.c 7 Mar 2009 13:38:10 -0000 1.42
+++ rpm/rpmio/rpmsq.c 27 Jan 2011 17:29:47 -0000 1.42.6.1
@@ -443,7 +443,7 @@
int tblsignum = (signum >= 0 ? signum : -signum);
struct sigaction sa;
rpmsig tbl;
- int ret = -1;
+ int ret = (signum >= 0 ? 1 : 0);
int xx;
xx = DO_LOCK ();
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
