From e548df92da6b7aef0f9adfb71cec1f8130187ddc Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Fri, 15 Jul 2011 07:18:08 +0200 Subject: [PATCH] [entropy.server] relax constraints during repo upload, backup db only once --- libraries/entropy/server/interfaces/db.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/entropy/server/interfaces/db.py b/libraries/entropy/server/interfaces/db.py index f1c763a54..14034a848 100644 --- a/libraries/entropy/server/interfaces/db.py +++ b/libraries/entropy/server/interfaces/db.py @@ -1514,14 +1514,10 @@ Name: %s True, mirrors = [uri]) continue - if copy_back and os.path.isfile(backup_dbpath): + if copy_back: # copy db back self._entropy.close_repositories() - further_backup_dbpath = old_dbpath+".security_backup" - if os.path.isfile(further_backup_dbpath): - os.remove(further_backup_dbpath) - shutil.copy2(old_dbpath, further_backup_dbpath) - shutil.move(backup_dbpath, old_dbpath) + os.rename(backup_dbpath, old_dbpath) # remove temporary directories for tmp_dir in tmp_dirs: