Use headerIsSource() everywhere for determining package type

diff --git a/lib/depends.c b/lib/depends.c
index bb063f1..0cabb7d 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -143,7 +143,7 @@ int rpmtsAddInstallElement(rpmts ts, Header h,
     }
 
     /* XXX Always add source headers. */
-    isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+    isSource = headerIsSource(h);
     if (isSource) {
        oc = ts->orderCount;
        goto addheader;

diff --git a/lib/idtx.c b/lib/idtx.c
index 88e26a7..4f25f58 100644 (file)
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -146,7 +146,7 @@ IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag)
        case RPMRC_NOTTRUSTED:
        case RPMRC_NOKEY:
        case RPMRC_OK:
-           isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+           isSource = headerIsSource(h);
            if (isSource)
                goto bottom;
            break;

diff --git a/lib/legacy.c b/lib/legacy.c
index 267b136..2372f14 100644 (file)
--- a/lib/legacy.c
+++ b/lib/legacy.c
@@ -258,7 +258,7 @@ void legacyRetrofit(Header h)
      compressFilelist(h);
 
     /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
-    if (!headerIsEntry(h, RPMTAG_SOURCERPM)) {
+    if (headerIsSource(h)) {
        int32_t one = 1;
        if (!headerIsEntry(h, RPMTAG_SOURCEPACKAGE))
            (void) headerAddEntry(h, RPMTAG_SOURCEPACKAGE, RPM_INT32_TYPE,

diff --git a/lib/psm.c b/lib/psm.c
index b131890..5a1ae77 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -243,7 +243,7 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
 
     rpmrc = RPMRC_OK;
 
-    isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+    isSource = headerIsSource(h);
 
     if (!isSource) {
        rpmlog(RPMLOG_ERR, _("source package expected, binary found\n"));

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 642d357..6f1cf3c 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1283,7 +1283,7 @@ if (fi->actions == NULL)
     if (ts != NULL)
     if (fi != NULL)
     if ((p = rpmtsRelocateElement(ts)) != NULL && rpmteType(p) == TR_ADDED
-     && !headerIsEntry(h, RPMTAG_SOURCEPACKAGE)
+     && !headerIsSource(h)
      && !headerIsEntry(h, RPMTAG_ORIGBASENAMES))
     {
        const char * fmt = rpmGetPath("%{?_autorelocate_path}", NULL);

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 1103fda..e4e66b2 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -455,7 +455,7 @@ if (fileURL[0] == '=') {
            break;
        }
 
-       eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE);
+       eiu->isSource = headerIsSource(eiu->h);
 
        if (eiu->isSource) {
            rpmlog(RPMLOG_DEBUG, _("\tadded source package [%d]\n"),

diff --git a/lib/rpmte.c b/lib/rpmte.c
index 4244538..18544dd 100644 (file)
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -114,7 +114,7 @@ static void addTE(rpmts ts, rpmte p, Header h,
        p->os = NULL;
        p->osScore = 0;
     }
-    p->isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+    p->isSource = headerIsSource(h);
 
     nb = strlen(p->NEVR) + 1;
     if (p->isSource)