#2 Fix default content resolver view
Merged 3 years ago by sgallagh. Opened 3 years ago by merlinm.
fedora-eln/ merlinm/eln-scripts fix-default-distro-view  into  main

file modified
+13 -3
@@ -51,13 +51,23 @@ 

      logger.debug("Debugging mode enabled")

  

      distro_url = "https://tiny.distro.builders"

-     distro_view = "eln-and-buildroot"

+     distro_view = "prototype-eln-and-buildroot"

      arches = ["aarch64", "armv7hl", "ppc64le", "s390x", "x86_64"]

  

+     if len(sys.argv) == 2 and sys.argv[1] == "--help":

+         print("Usage: {} [ distro-view [ distro-url [ 'arches' ] ] ]".format(sys.argv[0]))

+         print("  distro-view  The content resolver view"

+               "  [default: {}]".format(distro_view))

+         print("  distro-url   The top level of the content resolver"

+               "  [default: {}]".format(distro_url))

+         print("  arches       The architectures to include"

+               "  [default: '{}']".format(" ".join(arches)))

+         sys.exit()

+ 

      if len(sys.argv) > 1:

-         distro_url = sys.argv[1]

+         distro_view = sys.argv[1]

      if len(sys.argv) > 2:

-         distro_view = sys.argv[2]

+         distro_url = sys.argv[2]

      if len(sys.argv) > 3:

          arches = sys.argv[3].split()

  

file modified
+1 -1
@@ -142,7 +142,7 @@ 

  @click.option("--distro-view",

                help="The content resolver view",

                show_default=True,

-               default="eln-and-buildroot")

+               default="prototype-eln-and-buildroot")

  @click.option("--arches", "--arch",

                multiple=True,

                help="The architectures to include",

Fix default content resolver view to be prototype-eln-and-buildroot instead of eln-and-buildroot.

Also change order of get_distro_packages.py command line arguments (when run stand-alone) to be in a more sensible order and add a simple --help message.

Pull-Request has been merged by sgallagh

3 years ago