From 3e9d3bb1b9ddc0dc38458031f8cc6099a829117d Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Jan 09 2017 20:52:40 +0000
Subject: [dist-git] fix copy hack for new internal pyrpkg API


---

diff --git a/dist-git/copr-dist-git.spec b/dist-git/copr-dist-git.spec
index d4187df..0b126a4 100644
--- a/dist-git/copr-dist-git.spec
+++ b/dist-git/copr-dist-git.spec
@@ -18,7 +18,7 @@ BuildRequires: systemd
 BuildRequires: dist-git
 BuildRequires: python-bunch
 BuildRequires: python-requests
-BuildRequires: pyrpkg
+BuildRequires: pyrpkg >= 1.47
 # check
 BuildRequires: python-six
 BuildRequires: python-netaddr
@@ -44,7 +44,7 @@ Requires: python-bunch
 Requires: python-requests
 Requires: python2-psutil
 Requires: python-jinja2
-Requires: pyrpkg
+Requires: pyrpkg >= 1.47
 Requires: mock-scm
 %ifarch x86_64 i386 i486 i586 i686
 Requires: docker
diff --git a/dist-git/dist_git/srpm_import.py b/dist-git/dist_git/srpm_import.py
index 99924c8..a3222c8 100644
--- a/dist-git/dist_git/srpm_import.py
+++ b/dist-git/dist_git/srpm_import.py
@@ -22,13 +22,13 @@ log = logging.getLogger(__name__)
 
 
 def my_upload_fabric(opts):
-    def my_upload(repo_dir, reponame, filename, filehash):
+    def my_upload(repo_dir, reponame, abs_filename, filehash):
         """
         This is a replacement function for uploading sources.
         Rpkg uses upload.cgi for uploading which doesn't make sense
         on the local machine.
         """
-        source = os.path.join(repo_dir, filename)
+        filename = os.path.basename(abs_filename)
         destination = os.path.join(opts.lookaside_location, reponame,
                                    filename, filehash, filename)
 
@@ -39,7 +39,7 @@ def my_upload_fabric(opts):
                 log.exception(str(e))
 
         if not os.path.exists(destination):
-            shutil.copyfile(source, destination)
+            shutil.copyfile(abs_filename, destination)
 
     return my_upload