folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sanity. 

CVS patchset: 6689
CVS date: 2003/03/14 23:37:25
This commit is contained in:
jbj 2003-03-14 23:37:25 +00:00
parent 2d999924a6
commit d5be314063
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile.am
View File

@ -97,6 +97,9 @@ th: th.c librpm.la
trb: trb.o librpm.la
$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
tthread: tthread.o librpm.la
$(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@
tplatform: tplatform.o librpm.la
$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)

4
lib/psm.c
View File

@ -617,6 +617,7 @@ static pid_t psmRegisterFork(rpmpsm psm)
(void) sigfillset(&newMask); /* block all signals */
(void) sigprocmask(SIG_BLOCK, &newMask, &oldMask);
if (psm->reaper) {
if (psmtbl.psms)
for (i = 0; i < psmtbl.npsms; i++) {
if (empty == -1 && psmtbl.psms[i] == NULL)
@ -643,6 +644,7 @@ fprintf(stderr, " Register: %p[%d:%d:%d] = %p\n", psmtbl.psms, empty, psmtbl.np
/*@=modfilesys@*/
(void) enableSignal(SIGCHLD);
}
psm->reaped = 0;
if ((psm->child = fork()) != 0) {
@ -795,7 +797,7 @@ static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
psm->child = 0;
psm->reaped = 0;
psm->status = 0;
psm->reaper = 1;
psm->reaper = 0;
/* XXX FIXME: except for %verifyscript, rpmteNEVR can be used. */
xx = headerNVR(h, &n, &v, &r);