From c3fb00142852ad08c55d7423ad2fff3a0b86b2cb Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Dec 10 2019 16:29:17 +0000
Subject: [PATCH 1/2] Simplify methods for getting namespace giturl


Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
index ab0ad39..7fbc6c2 100644
--- a/pyrpkg/__init__.py
+++ b/pyrpkg/__init__.py
@@ -1377,32 +1377,16 @@ class Commands(object):
             namespace rpms will set.
         :rtype: str
         """
-
-        if self.distgit_namespaced:
-            if '/' in repo_name:
-                giturl = self.gitbaseurl % {
-                    'user': self.user,
-                    'repo': repo_name,
-                    # This is for the compatible with old format
-                    'module': repo_name,
-                }
-            else:
-                # Default to rpms namespace for backwards compat
-                rpms_repo_name = 'rpms/%s' % repo_name
-                giturl = self.gitbaseurl % {
-                    'user': self.user,
-                    'repo': rpms_repo_name,
-                    # This is for the compatible with old format
-                    'module': rpms_repo_name,
-                }
-        else:
-            giturl = self.gitbaseurl % {
-                'user': self.user,
-                'repo': repo_name,
-                # This is for the compatible with old format
-                'module': repo_name
-            }
-
+        if self.distgit_namespaced and '/' not in repo_name:
+            # Default to rpms namespace for backwards compat
+            repo_name = 'rpms/%s' % repo_name
+
+        giturl = self.gitbaseurl % {
+            'user': self.user,
+            'repo': repo_name,
+            # This is for the compatible with old format
+            'module': repo_name
+        }
         return giturl
 
     def _get_namespace_anongiturl(self, repo_name):
@@ -1414,28 +1398,15 @@ class Commands(object):
             namespace rpms will be set.
         :rtype: str
         """
+        if self.distgit_namespaced and '/' not in repo_name:
+            # Default to rpms namespace for backwards compat
+            repo_name = 'rpms/%s' % repo_name
 
-        if self.distgit_namespaced:
-            if '/' in repo_name:
-                giturl = self.anongiturl % {
-                    'repo': repo_name,
-                    # This is for the compatible with old format
-                    'module': repo_name,
-                }
-            else:
-                rpms_repo_name = 'rpms/%s' % repo_name
-                # Default to rpms namespace for backwards compat
-                giturl = self.anongiturl % {
-                    'repo': rpms_repo_name,
-                    # This is for the compatible with old format
-                    'module': rpms_repo_name,
-                }
-        else:
-            giturl = self.anongiturl % {
-                'repo': repo_name,
-                'module': repo_name,
-            }
-
+        giturl = self.anongiturl % {
+            'repo': repo_name,
+            # This is for the compatible with old format
+            'module': repo_name,
+        }
         return giturl
 
     def add_tag(self, tagname, force=False, message=None, file=None):

From aaad2a8befa2d2eb631aaaf9fded00695664491c Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Dec 11 2019 09:58:38 +0000
Subject: [PATCH 2/2] Add check for wrong repo name format during clone


JIRA: COMPOSE-3818
Fixes: https://pagure.io/fedpkg/issue/353

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
index c3f2827..a26e1be 100644
--- a/pyrpkg/cli.py
+++ b/pyrpkg/cli.py
@@ -1906,6 +1906,12 @@ class cliClient(object):
         self.cmd.clog(raw=self.args.raw)
 
     def clone(self):
+        # corrects user-given wrong format of a repo name
+        if self.args.repo[0].endswith('.git'):
+            repo = self.args.repo[0][:-4]
+            self.log.warn("Repo name should't contain '.git' suffix. "
+                          "Correcting the repo name: '%s'" % repo)
+
         if self.args.branches:
             self.cmd.clone_with_dirs(self.args.repo[0],
                                      anon=self.args.anonymous,