Hi Housam,
On Fri, Jan 26, 2024 at 4:01 PM Housam Alamour <halam...@redhat.com> wrote:
>
> +/* Definitions of arguments for argp functions. */
> static const struct argp_option options[] =
> {
> { NULL, 0, NULL, OPTION_DOC, N_("Output options:"), 1 },
> @@ -89,58 +89,50 @@ static const struct argp_option options[] =
> { "verbose", 'v', NULL, 0,
> N_ ("Increase verbosity of logging messages."), 0 },
> { "cu-only", 'c', NULL, 0, N_ ("Only list the CU names."), 0 },
> - #ifdef HAVE_LIBARCHIVE
> - { "zip", 'z', NULL, 0, N_ ("Zip all the source files and send to stdout."
> - "Cannot be used with the null option"), 0 },
> - #ifdef ENABLE_LIBDEBUGINFOD
> - { "no-backup", 'b', NULL, 0, N_ ("Disables local source file search when
> "
> - "debuginfod fails to fetch files. This option is only applicable"
> - "when fetching and zipping files."), 0 },
> - #endif
> - #endif
> + { "zip", 'z', NULL, 0, N_ ("Zip all the source files and send to stdout. "
> + "By default, priority is given to fetching source files from "
> + "debuginfod over local source files"), 0 },
> + { "no-backup", 'b', NULL, 0, N_ ("Disables local source file search when "
> + "debuginfod fails to fetch files. This option is only applicable "
> + "when fetching and zipping files."), 0 },
> { NULL, 0, NULL, 0, NULL, 0 }
> };
I originally suggested keeping -z/-b as valid options even when
srcfiles isn't built with libarchive/libdebuginfod support, but later on
IRC we decided to keep -z/-b conditional on building srcfiles with
the necessary support. I think these #ifdef might have been removed
by mistake.
Also when you post a revised patch, it's a bit easier for me if you just
post the current definitive patch with all commits squashed. I'll just diff
your patches if I want to compare changes since the last revision!
Aaron
