From d8c3e4529aebd77f0ea0e17c5b2b009309322bbd Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Fri, 25 Mar 2011 22:43:22 +0100 Subject: [PATCH] [entropy.server] add Entropy Web Services file upload/download handling --- libraries/entropy/server/interfaces/db.py | 7 +++++++ libraries/entropy/server/interfaces/main.py | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/libraries/entropy/server/interfaces/db.py b/libraries/entropy/server/interfaces/db.py index e9979aad4..7c38e5a50 100644 --- a/libraries/entropy/server/interfaces/db.py +++ b/libraries/entropy/server/interfaces/db.py @@ -532,6 +532,13 @@ class ServerPackagesRepositoryUpdater(object): data['keywords_file'] = keywords_file extra_text_files.append(keywords_file) + webserv_file = self._entropy._get_local_repository_webserv_file( + self._repository_id) + if os.path.isfile(webserv_file) or download: + if download: + data['webserv_file'] = webserv_file + extra_text_files.append(webserv_file) + gpg_file = self._entropy._get_local_repository_gpg_signature_file( self._repository_id) if os.path.isfile(gpg_file) or download: diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py index bbd05f817..55a388127 100644 --- a/libraries/entropy/server/interfaces/main.py +++ b/libraries/entropy/server/interfaces/main.py @@ -1292,6 +1292,10 @@ class Server(Client): return os.path.join(self._get_local_repository_dir(repository_id, branch = branch), etpConst['etpdatabasekeywordsfile']) + def _get_local_repository_webserv_file(self, repository_id, branch = None): + return os.path.join(self._get_local_repository_dir(repository_id, + branch = branch), etpConst['etpdatabasewebservicesfile']) + def _get_local_repository_dir(self, repository_id, branch = None): srv_set = self._settings[Server.SYSTEM_SETTINGS_PLG_ID]['server'] if branch is None: