From 18caf4f0badfeb6f98c20880b56679423189c432 Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: May 02 2017 05:44:14 +0000
Subject: [dist-git] Bug 1447102 - fedpkg build fail during import phase


---

diff --git a/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json b/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json
index 2fb44ea..e5c449c 100644
--- a/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json
+++ b/beaker-tests/Regression/dist-git/tests/batch1/import-tasks.json
@@ -130,5 +130,16 @@
     "source_type": 1,
     "task_id": "12-mga6",
     "user": "clime"
+},
+{
+    "_description": "Dist-git import test with src url",
+    "_expected_outcome": "success",
+
+    "branch": "master",
+    "project": "example",
+    "source_json": "{\"clone_url\": \"https://src.fedoraproject.org/git/rpms/golang.git\", \"branch\": \"f26\" }",
+    "source_type": 7,
+    "task_id": "13-master",
+    "user": "clime"
 }
 ]
diff --git a/dist-git/dist_git/dist_git_importer.py b/dist-git/dist_git/dist_git_importer.py
index e16025f..b9e1798 100755
--- a/dist-git/dist_git/dist_git_importer.py
+++ b/dist-git/dist_git/dist_git_importer.py
@@ -435,7 +435,7 @@ class DistGitProvider(SrpmBuilderProvider):
         f.close()
 
         if self.task.distgit_branch:
-            cmd = ['fedpkg', '--config', config_path, '--dist', self.task.distgit_branch, 'srpm']
+            cmd = ['fedpkg', '--config', config_path, '--release', self.task.distgit_branch, 'srpm']
         else:
             cmd = ['fedpkg', 'srpm']
 
diff --git a/dist-git/dist_git/templates/fedpkg.conf.j2 b/dist-git/dist_git/templates/fedpkg.conf.j2
index f783eb8..a5a6180 100644
--- a/dist-git/dist_git/templates/fedpkg.conf.j2
+++ b/dist-git/dist_git/templates/fedpkg.conf.j2
@@ -1,6 +1,6 @@
 [fedpkg]
-lookaside = http://{{ distgit_domain }}/repo/pkgs
-lookasidehash = md5
+lookaside = https://{{ distgit_domain }}/repo/pkgs
+lookasidehash = sha512
 lookaside_cgi = https://{{ distgit_domain }}/repo/pkgs/upload.cgi
 gitbaseurl = ssh://%(user)s@{{ distgit_domain }}/%(module)s
 anongiturl = git://{{ distgit_domain }}/%(module)s
@@ -14,4 +14,5 @@ clone_config =
   bz.default-version rawhide
   bz.default-component %(module)s
   sendemail.to %(module)s-owner@fedoraproject.org
+  push.default simple
 distgit_namespaced = True