Ok, Rebased and merged.
--
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/710#issuecomment-496093898___
Rpm-maint mailing list
Closed #710.
--
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/710#event-2368433852___
Rpm-maint mailing list
Corrected the commit message of the first commit.
--
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/710#issuecomment-495102226___
pavlinamv commented on this pull request.
> rl->lastConditional = lineType;
spec->readStack = rl;
spec->line[0] = '\0';
+} else if (lineType->id & (LINE_ELIF | LINE_ELIFARCH | LINE_ELIFOS)) {
It is changed in the new version.
--
You are receiving this because you
pmatilai commented on this pull request.
> rl->lastConditional = lineType;
spec->readStack = rl;
spec->line[0] = '\0';
+} else if (lineType->id & (LINE_ELIF | LINE_ELIFARCH | LINE_ELIFOS)) {
The various ELIF's are another candidate for a bit mask, this set is repeated
Panu's comments are incorporated.
--
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/710#issuecomment-494773665___
Rpm-maint
pmatilai commented on this pull request.
> /* Don't expand macros (eg. %define) in false branch of %if clause */
-if (!spec->readStack->reading)
+} else if (!spec->readStack->reading)
return 0;
If one branch of if uses { } blocks, all the branches should have them.
--
pmatilai commented on this pull request.
> @@ -501,17 +506,24 @@ int readLine(rpmSpec spec, int strip)
goto retry;
}
-after_classification:
-if (match != -1) {
+if (lineType->id & (LINE_IF | LINE_IFARCH | LINE_IFNARCH | LINE_IFOS |
+ LINE_IFNOS)) {
This calls
You can view, comment on, or merge this pull request online at:
https://github.com/rpm-software-management/rpm/pull/710
-- Commit Summary --
* Use already detected line type to identify %if lines
* Consolidate %if condition parsing to one place
* Make "Bad %if condition" error message
