Check for orphan'ed chnages in rpm-4.1.
CVS patchset: 5718 CVS date: 2002/09/19 16:30:25
This commit is contained in:
parent
3ea6dcbfe5
commit
0fd303f38a
1
.exclude
1
.exclude
|
@ -32,6 +32,7 @@ config.log
|
|||
config.status
|
||||
config.sub
|
||||
configure
|
||||
db
|
||||
doxygen
|
||||
libtool
|
||||
ltconfig
|
||||
|
|
|
@ -12,7 +12,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
|
|||
po/*.in po/*.po po/rpm.pot \
|
||||
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
|
||||
|
||||
SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_LIBELF_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
|
||||
SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/build \
|
||||
|
@ -25,7 +25,7 @@ INCLUDES = \
|
|||
@WITH_ZLIB_INCLUDE@ \
|
||||
@INCPATH@
|
||||
|
||||
myLDFLAGS = @LDFLAGS_STATIC@
|
||||
myLDFLAGS = # @LDFLAGS_STATIC@
|
||||
|
||||
# XXX libtool can/should generate dependent libs.
|
||||
# XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <signal.h>
|
||||
#include <sys/signal.h>
|
||||
|
||||
#include <rpmio_internal.h>
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
|
|
|
@ -555,7 +555,7 @@ fprintf(stderr, "*** rpmts_IDTXglob(%p) ts %p\n", s, s->ts);
|
|||
globstr = _free(globstr);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (idtx->nidt <= 0) {
|
||||
if (idtx == NULL || idtx->nidt <= 0) {
|
||||
Py_INCREF(Py_None);
|
||||
result = Py_None;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue