/**
* Define per-header macros.
- * @param fi transaction element file info
* @param h header
* @return 0 always
*/
-static int rpmInstallLoadMacros(rpmfi fi, Header h)
+static void rpmInstallLoadMacros(Header h)
{
const struct tagMacro * tagm;
continue;
switch (rpmtdType(&td)) {
- case RPM_INT32_TYPE: /* fallthrough */
- case RPM_STRING_TYPE:
+ default:
body = rpmtdFormat(&td, RPMTD_FORMAT_STRING, NULL);
addMacro(NULL, tagm->macroname, NULL, body, -1);
free(body);
break;
case RPM_NULL_TYPE:
- case RPM_CHAR_TYPE:
- case RPM_INT8_TYPE:
- case RPM_INT16_TYPE:
- case RPM_BIN_TYPE:
- case RPM_STRING_ARRAY_TYPE:
- case RPM_I18NSTRING_TYPE:
- default:
break;
}
rpmtdFreeData(&td);
}
- return 0;
}
/**
goto exit;
}
+ rpmInstallLoadMacros(h);
+
fi = rpmfiNew(ts, h, RPMTAG_BASENAMES, RPMFI_KEEPHEADER);
h = headerFree(h);
rpmteSetHeader(fi->te, fi->h);
fi->te->fd = fdLink(fd, RPMDBG_M("installSourcePackage"));
- (void) rpmInstallLoadMacros(fi, fi->h);
if (rpmMkdirs(rpmtsRootDir(ts), "%{_topdir}:%{_sourcedir}:%{_specdir}")) {
goto exit;