Add `--with-defaults` command-line option to LbExec

GaudiConf/python/GaudiConf/LbExec/__init__.py

 ###############################################################################
-# (c) Copyright 2022 CERN for the benefit of the LHCb Collaboration           #
+# (c) Copyright 2022-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -25,6 +25,7 @@ def main(function,
          extra_args,
          *,
          dry_run=False,
+         with_defaults=False,
          export=None,
          app_type="Gaudi::Application"):
     """Run an lbexec-style Gaudi job.
@@ -34,6 +35,7 @@ def main(function,
         options (Options): An initialised APP.Options object
         extra_args (list of str): list of strings to add the the call to ``function``
         dry_run (bool): Only generate the configuration and don't actually start the job
+        with_defaults (bool): Include options set to default values when writing them out
         export (str): Filename to write the options out (or ``'-'`` to write to stdout as ``.opts``)
         app_type (str): The ``Gaudi.Application`` ``appType`` to run
 
@@ -42,7 +44,7 @@ def main(function,
     """
 
     config = function(options, *extra_args)
-    opts = config2opts(config)
+    opts = config2opts(config, with_defaults)
 
     if export:
         click.echo(

GaudiConf/python/GaudiConf/LbExec/__main__.py

 #!/usr/bin/env python
 ###############################################################################
-# (c) Copyright 2022 CERN for the benefit of the LHCb Collaboration           #
+# (c) Copyright 2022-2023 CERN for the benefit of the LHCb Collaboration      #
 #                                                                             #
 # This software is distributed under the terms of the GNU General Public      #
 # Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
@@ -38,6 +38,11 @@ def parse_args():
         "--export",
         help='Write a file containing the full options (use "-" for stdout)',
     )
+    parser.add_argument(
+        "--with-defaults",
+        action="store_true",
+        help="Include options set to default values (for use with --export)",
+    )
     parser.add_argument(
         "--app-type",
         default="Gaudi::Application",