From 1d471a0075ae93c2e390ffd6176c7a44868966f8 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Jul 10 2020 17:18:56 +0000
Subject: Fix default content resolver view

Change get_distro_packages.py command line arguments to a more sensible order and add
  simple --help output

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>

---

diff --git a/get_distro_packages.py b/get_distro_packages.py
index f072911..2e714b0 100755
--- a/get_distro_packages.py
+++ b/get_distro_packages.py
@@ -51,13 +51,23 @@ if __name__ == "__main__":
     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()
 
diff --git a/untag-trimmed-builds.py b/untag-trimmed-builds.py
index e825945..3190212 100755
--- a/untag-trimmed-builds.py
+++ b/untag-trimmed-builds.py
@@ -142,7 +142,7 @@ def untag_builds(session, koji_tag, dry_run, builds):
 @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",