From 47b650bd5f3e33ca0820537c459faeb31cee5fb8 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 31 Dec 2009 11:42:08 +0100 Subject: [PATCH] [entropy.server] do not upload signature.asc twice --- libraries/entropy/server/interfaces/mirrors.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py index b488a5a81..27915e8bc 100644 --- a/libraries/entropy/server/interfaces/mirrors.py +++ b/libraries/entropy/server/interfaces/mirrors.py @@ -1511,15 +1511,9 @@ class Server: if gpg_item_id in upload_data: raise KeyError("wtf!") sign_path = repo_sec.sign_file(repo, item_path) - gpg_upload_data[gpg_item_id] = sign_path + gpg_upload_data[gpg_item_id] = sign_path upload_data.update(gpg_upload_data) - # also add GPG key to upload_data - gpg_path = self.__write_gpg_pubkey(repo_sec, repo) - if 'gpg_signature' in upload_data: - raise KeyError("cannot add gpg_signature to upload_data") - upload_data['gpg_signature'] = gpg_path - def mirror_lock_check(self, uri, repo = None): """ Return whether mirror is locked.