From a4203b7dc074d3ec52bfc6d19a5acc7bcbfe6623 Mon Sep 17 00:00:00 2001
From: Aditya Bisoi <abisoi@redhat.com>
Date: Jun 16 2021 00:14:14 +0000
Subject: Deprecated arguments --dist have been removed, and related tests have been updated.


JIRA: RHELCMP-4770

Signed-off-by: Aditya Bisoi <abisoi@redhat.com>

---

diff --git a/conf/bash-completion/fedpkg.bash b/conf/bash-completion/fedpkg.bash
index 4f629d3..83c4d66 100644
--- a/conf/bash-completion/fedpkg.bash
+++ b/conf/bash-completion/fedpkg.bash
@@ -27,7 +27,7 @@ _fedpkg()
     # global options
 
     local options="--help -v -q"
-    local options_value="--dist --release --user --path --user-config --name --namespace"
+    local options_value="--release --user --path --user-config --name --namespace"
     local commands="build chain-build ci clean clog clone co commit compile \
     container-build diff gimmespec giturl help gitbuildhash import install lint \
     local mockbuild mock-config module-build module-build-cancel \
@@ -70,7 +70,7 @@ _fedpkg()
         fi
 
         case "$prev" in
-            --dist | --release | --user | -u | --config)
+            --release | --user | -u | --config)
                 ;;
             --path)
                 _filedir_exclude_paths
diff --git a/test/test_retire.py b/test/test_retire.py
index db30e13..16b94da 100644
--- a/test/test_retire.py
+++ b/test/test_retire.py
@@ -75,7 +75,7 @@ class RetireTestCase(unittest.TestCase):
     @mock.patch("requests.get", new=lambda *args, **kwargs: mock.Mock(status_code=404))
     def test_retire_with_namespace(self):
         self._setup_repo('ssh://git@pkgs.example.com/rpms/fedpkg')
-        args = ['fedpkg', '--dist=rawhide', 'retire', 'my reason']
+        args = ['fedpkg', '--release=rawhide', 'retire', 'my reason']
 
         client = self._fake_client(args)
         client.retire()
@@ -86,7 +86,7 @@ class RetireTestCase(unittest.TestCase):
     @mock.patch("requests.get", new=lambda *args, **kwargs: mock.Mock(status_code=404))
     def test_retire_without_namespace(self):
         self._setup_repo('ssh://git@pkgs.example.com/fedpkg')
-        args = ['fedpkg', '--dist=rawhide', 'retire', 'my reason']
+        args = ['fedpkg', '--release=rawhide', 'retire', 'my reason']
 
         client = self._fake_client(args)
         client.retire()
@@ -116,7 +116,7 @@ class RetireTestCase(unittest.TestCase):
     )
     def test_package_on_retired(self):
         self._setup_repo("ssh://git@pkgs.example.com/fedpkg")
-        args = ["fedpkg", "--dist=rawhide", "retire", "my reason"]
+        args = ["fedpkg", "--release=rawhide", "retire", "my reason"]
 
         client = self._fake_client(args)
         client.retire()