From 04073f11083fc482878d84e882da257418d565f0 Mon Sep 17 00:00:00 2001 From: clime Date: Tue, 6 Feb 2018 19:30:38 +0100 Subject: [PATCH] fix position of default namespace application --- scripts/httpd/upload.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/httpd/upload.cgi b/scripts/httpd/upload.cgi index b5a4095..ae479b9 100644 --- a/scripts/httpd/upload.cgi +++ b/scripts/httpd/upload.cgi @@ -171,14 +171,14 @@ def main(): username, name, filename, hash_type.upper(), checksum)) - module_dir = os.path.join(config['dist-git']['cache_dir'], "lookaside/pkgs", name) - hash_dir = os.path.join(module_dir, filename, hash_type, checksum) - msgpath = os.path.join(name, filename, hash_type, checksum, filename) - # prefix name by default namespace if configured if config['dist-git'].get('default_namespace'): name = ensure_namespaced(name, config['dist-git'].get('default_namespace')).strip('/') + module_dir = os.path.join(config['dist-git']['cache_dir'], "lookaside/pkgs", name) + hash_dir = os.path.join(module_dir, filename, hash_type, checksum) + msgpath = os.path.join(name, filename, hash_type, checksum, filename) + # first test if the module really exists git_dir = os.path.join(config['dist-git']['gitroot_dir'], '%s.git' % name) if not os.path.isdir(git_dir):