rpm-software-management / spec-cleaner / 38716543885

99%

push

github

Keep a body section's lines in its class after a stray conditional end

A conditional opened before a section header (as in
'%if X / %files a / %else / %files b / %endif' or a whole subpackage
wrapped in %if) ends inside the section that follows. That %endif or
%else breaks out into a plain Section, and every later line of the body
stayed there, so RpmFiles, RpmScriptlets and the other body classes
never cleaned them: '%doc COPYING', man page suffixes, %run_ldconfig and
build tool FIXMEs were left as they were, and each later top-level
conditional broke out again and gained a blank line before it.

After such a break-out, hand the next line that is not blank, a comment,
another condition change, a section start or a preamble start back to
the body class it came from. A %define or other preamble start after the
break-out still opens a preamble chunk, as it does for alternative
preambles in %else branches.

The resumed body has no header and cannot see what came before the
conditional, so it is marked headless: RpmFiles keeps every %defattr,
since one may reset a %defattr in another branch; RpmScriptlets does not
fold '/sbin/ldconfig' into its first line; RpmDescription adds lines as
they are; and RpmBuild looks at the line above it for its FIXME.

Across 39 Factory specs only coreutils, grub2, samba and util-linux
change: grub2's wrapped %files get their usual cleanup, and the others
lose blank lines that only the break-out inserted.

34 of 34 new or added lines in 6 files covered. (100.0%)

2493 of 2514 relevant lines covered (99.16%)

4.96 hits per line