Permit file objects in python header constructor

[platform/upstream/rpm.git] / build / parsePreamble.c

diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index a43e85d..82744fd 100644 (file)
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -428,12 +428,8 @@ spectag stashSt(rpmSpec spec, Header h, rpmTag tag, const char * lang)
        t->t_lang = xstrdup(lang);
        t->t_msgid = NULL;
        if (!(t->t_lang && !rstreq(t->t_lang, RPMBUILD_DEFAULT_LANG))) {
-           struct rpmtd_s td;
-           if (headerGet(h, RPMTAG_NAME, &td, HEADERGET_MINMEM)) {
-               rasprintf(&t->t_msgid, "%s(%s)", 
-                        rpmtdGetString(&td), rpmTagGetName(tag));
-               rpmtdFreeData(&td);
-           }
+           rasprintf(&t->t_msgid, "%s(%s)", 
+                     headerGetString(h, RPMTAG_NAME), rpmTagGetName(tag));
        }
     }
     return t;
@@ -816,7 +812,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
 {
     int nextPart = PART_ERROR;
     int res = PART_ERROR; /* assume failure */
-    int rc, xx;
+    int rc;
     char *name, *linep;
     int flag = 0;
     Package pkg;
@@ -841,9 +837,8 @@ int parsePreamble(rpmSpec spec, int initialPackage)
        
        /* Construct the package */
        if (flag == PART_SUBNAME) {
-           const char * mainName;
-           xx = headerNVR(spec->packages->header, &mainName, NULL, NULL);
-           rasprintf(&NVR, "%s-%s", mainName, name);
+           rasprintf(&NVR, "%s-%s", 
+                   headerGetString(spec->packages->header, RPMTAG_NAME), name);
        } else
            NVR = xstrdup(name);
        free(name);