PR#23: [dist-git] fix copy hack for new internal pyrpkg API - copr/copr

Pavel Raiskup • 8 years ago

3e9d3bb

dist-git/copr-dist-git.spec

file modified

+2 -2

		`@@ -18,7 +18,7 @@`
		`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-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`

dist-git/dist_git/srpm_import.py

file modified

+3 -3

		`@@ -22,13 +22,13 @@`


		`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 @@`
		`log.exception(str(e))`

		`if not os.path.exists(destination):`
		`- shutil.copyfile(source, destination)`
		`+ shutil.copyfile(abs_filename, destination)`

		`return my_upload`