From 21e2251008dd8be22bbcd2e786e9836e90e68221 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Fri, 21 Sep 2012 14:57:48 +0200 Subject: [PATCH] [entropy.server.mirrors] tidy_mirrors: make sure to clean the upload/ directory as well --- lib/entropy/server/interfaces/mirrors.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/entropy/server/interfaces/mirrors.py b/lib/entropy/server/interfaces/mirrors.py index 5f08b9e95..b99760d72 100644 --- a/lib/entropy/server/interfaces/mirrors.py +++ b/lib/entropy/server/interfaces/mirrors.py @@ -2232,12 +2232,16 @@ class Server(object): package_path = self._entropy.complete_local_package_path( package_rel, repository_id) + # if package files are stuck in the upload/ directory + # it means that the repository itself has never been pushed + up_package_path = self._entropy.complete_local_upload_package_path( + package_rel, repository_id) package_path_expired = package_path + \ etpConst['packagesexpirationfileext'] # .expired for all the paths in removal doesn't sound # that ok but since we handle ENOENT, that's fine - my_rm_list = (package_path, package_path_expired) + my_rm_list = (package_path, up_package_path, package_path_expired) for myfile in my_rm_list: try: os.remove(myfile)