Re: [libvirt] [PATCHv2] spec: indent %if to make it easier to see conditions

On 01/21/2013 04:58 AM, Daniel P. Berrange wrote: My use of cppi limits us to 1 space indentation in the C file that it checks; but since I'm already processing things through a sed script to get to a C file, I can rather easily alter the number of spaces that cppi sees :) Here's the diff I squashed in to convert the syntax check to 4-space indent; the one-time actual diff of the files themselves was trivial (done with: sed -i 's/^\( *\)%/\1\1\1\1%/' *.spec.in and does not show up to 'git diff -b' in relation to the posted v2), so I've gone ahead and pushed this patch (given that you acked the concept in v1 and that I resolved your concern about indentation level). diff --git i/cfg.mk w/cfg.mk index 7c8ba2e..d9ab2da 100644 --- i/cfg.mk +++ w/cfg.mk @@ -630,7 +630,7 @@ sc_spec_indentation: for f in $$($(VC_LIST_EXCEPT) | grep '\.spec\.in$$'); do \ sed -e 's|#|// #|; s|%ifn*\(arch\)* |#if a // |' \ -e 's/%\(else\|endif\|define\)/#\1/' \ - -e 's/^\( *\)#/#\1/; s|^\([^#/]\)|// \1|' $$f \ + -e 's/^\( *\)\1\1\1#/#\1/; s|^\( *[^#/]\)|// \1|' $$f \ | cppi -a -c 2>&1 | sed "s|standard input|$$f|"; \ done | { if grep . >&2; then false; else :; fi; } \ || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org