Skip to content

Commit

Permalink
Fix a regression on dependency generator namespace directive
Browse files Browse the repository at this point in the history
Commit ce6c381 accidentally changed
this namespace string literal too, oops. Possible because there was
no test on it, so add one.
  • Loading branch information
pmatilai committed May 17, 2024
1 parent 5e7ba21 commit fd056ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/rpmfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ static int applyAttr(rpmfc fc, int aix,
}

if (rpmMacroIsDefined(NULL, mname)) {
char *ns = rpmfcAttrMacro(aname, "namespc", NULL);
char *ns = rpmfcAttrMacro(aname, "namespace", NULL);
rc = rpmfcHelper(fc, fnx.data(), fnx.size(), attr->proto,
excl, dep->type, dep->tag, ns, mname);
free(ns);
Expand Down
3 changes: 2 additions & 1 deletion tests/rpmbuild.at
Original file line number Diff line number Diff line change
Expand Up @@ -1120,11 +1120,12 @@ RPMDB_INIT
runroot rpmbuild -bb --quiet \
--define '__script_mime text/plain' \
--define '__script_magic %{nil}' \
--define '__script_namespace mine' \
/data/SPECS/shebang.spec
runroot rpm -qp --requires /build/RPMS/noarch/shebang-0.1-1.noarch.rpm|grep -v ^rpmlib
],
[0],
[/bin/blabla
[mine(/bin/blabla)
],
[])
RPMTEST_CLEANUP
Expand Down

0 comments on commit fd056ff

Please sign in to comment.