Bug 1315423

Well, I've looked on this and I suggest following solution.

In dist-git scripts there is an upload.cgi which handles the process of uploading files. Although in copr-dist-git we *do not* use this script at all.

We use simple function that only copies source files from /tmp to cache directory. The directory has following structure.

/var/lib/dist-git/cache/lookaside/pkgs/<user>/<project>/<package>/<package>-<version>.tar.gz/<hash>/<package>-<version>.tar.gz

Only thing that we need to do is add md5/ directory before <hash>.


I suggest following solution.

First of all we need to modify our current cache structure. For instance this way:


#!/bin/bash

DIR=/var/lib/dist-git/cache/lookaside/pkgs/*/*/*/*

for dir in $DIR; do
	for hash in $(find $dir/* -maxdepth 0 | grep -v "md5$"); do
		echo I will create: $dir/md5/`basename $hash`

		# Uncomment these lines only when
		# you are really sure what are you doing
		# mkdir -p $dir/md5
		# cp -r $hash $dir/md5
	done
done


After this, if you upgrade fedpkg on backend to >=1.21, you will be able to obtain src.rpm package by 

fedpkg-copr --verbose --dist f23 srpm

as it is showed in attached reproducer, which would otherwise failed.


To upload new sources to correct path, we can apply this patch


commit bb1ccb4e96abaa8e7d75f137d252b2cfac4bca0b
Author: Jakub Kadlčík <jkadlcik>
Date:   Wed May 25 21:39:02 2016 +0200

    [dist-git] update path for cached files to work with fedpkg-1.21 (RhBug: 1315423)

diff --git a/dist-git/dist_git/srpm_import.py b/dist-git/dist_git/srpm_import.py
index 967f188..56c971a 100644
--- a/dist-git/dist_git/srpm_import.py
+++ b/dist-git/dist_git/srpm_import.py
@@ -30,7 +30,7 @@ def my_upload_fabric(opts):
         """
         source = os.path.join(repo_dir, filename)
         destination = os.path.join(opts.lookaside_location, reponame,
-                                   filename, filehash, filename)
+                                   filename, "md5", filehash, filename)
         if not os.path.exists(destination):
             os.makedirs(os.path.dirname(destination))
             shutil.copyfile(source, destination)



What do you think about such solution msuchy?

I think a redirect should suffice.

Fixed by https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=6ec8a7ea.

Clearing needinfo