Fix check for source RPM.

CVS patchset: 2685
CVS date: 1999/01/08 20:30:50

diff --git a/lib/depends.c b/lib/depends.c
index e61a839..4d1a0ce 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -236,7 +236,7 @@ int rpmtransAddPackage(rpmTransactionSet rpmdep, Header h, FD_t fd,
     char ** obsoletes;
 
     /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
-    if (!headerIsEntry(h, RPMTAG_SOURCERPM))
+    if (!headerIsEntry(h, RPMTAG_SOURCEPACKAGE))
        return 1;
 
     /* FIXME: handling upgrades like this is *almost* okay. It doesn't

diff --git a/tests/hello-test/ckH.exp b/tests/hello-test/ckH.exp
index 4baa677..a91c6c1 100644 (file)
--- a/tests/hello-test/ckH.exp
+++ b/tests/hello-test/ckH.exp
@@ -38,8 +38,8 @@ Entry      : 016 (1021)RPMTAG_OS      STRING_TYPE        0xffffffff 00000001
 Entry      : 017 (1022)RPMTAG_ARCH    STRING_TYPE        0xffffffff 00000001
        Data: 000 sparc
 Entry      : 018 (1027)RPMTAG_FILENAMES STRING_ARRAY_TYPE  0xffffffff 00000003
-       Data: 000 /home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0
-       Data: 001 /home/devel/jbj/src/rpm/tests/usr/doc/hello-1.0/FAQ
+       Data: 000 /usr/doc/hello-1.0
+       Data: 001 /usr/doc/hello-1.0/FAQ
        Data: 002 /usr/local/bin/hello
 Entry      : 019 (1028)RPMTAG_FILESIZES INT32_TYPE         0xffffffff 00000003
        Data: 000 0x00000400 (1024)