[Rpm-maint] [rpm-software-management/rpm] implement %elif (#613)

[Panu Matilainen]

pmatilai commented on this pull request.



>      lbuf = spec->lbuf;
     SKIPSPACE(lbuf);
     if (lbuf[0] == '#')
 	isComment = 1;
 
-     /* Don't expand macros (eg. %define) in false branch of %if clause */
-    if (!spec->readStack->reading)
+    /* Don't expand macros after %elif (resp. %elifarch, %elifos) in false branch */
+    if (ISMACROWITHARG(lbuf, "%elif")) {
+	if (!spec->readStack->readable)

As mentioned in earlier private comments, the need to test for ISMACROWITHARG(lbuf, "%elif") here seems out of place, and suggests that the if-elif-else branching logic needs some better form of tracking than the current combo of reading + readable.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/613#pullrequestreview-189740756
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rpm.org/pipermail/rpm-maint/attachments/20190107/ac41246a/attachment.html>