From c0edbbe278d7916f91ecaebe2c9cc04057edced4 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 24 Jul 2010 22:26:50 +0200 Subject: [PATCH] [entropy.services.repository] do not keep printing that repository is locked --- .../entropy/services/repository/interfaces.py | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libraries/entropy/services/repository/interfaces.py b/libraries/entropy/services/repository/interfaces.py index a0a0e7a6a..885185fd7 100644 --- a/libraries/entropy/services/repository/interfaces.py +++ b/libraries/entropy/services/repository/interfaces.py @@ -185,21 +185,22 @@ class Server(SocketHost): if os.path.lexists(lock_file): # locked ! - self.repositories[repo_tuple]['locked'] = True - # trash old databases - self.close_db(db_path) - do_clear.add(repository) + if not self.repositories[repo_tuple]['locked']: + self.repositories[repo_tuple]['locked'] = True + # trash old databases + self.close_db(db_path) + do_clear.add(repository) - mytxt = blue("%s.") % ( - "repository is now locked, it's being uploaded.",) - self.output( - "[%s] %s" % ( - brown(str(repo_tuple)), - mytxt, - ), - importance = 1, - level = "info" - ) + mytxt = blue("%s.") % ( + "repository is now locked, it's being uploaded",) + self.output( + "[%s] %s" % ( + brown(str(repo_tuple)), + mytxt, + ), + importance = 1, + level = "info" + ) continue elif self.repositories[repo_tuple]['locked']: @@ -254,8 +255,8 @@ class Server(SocketHost): else: mytxt = darkred("%s.") % ( - "error during repository unpack, disabling repository.",) - self.output( + "error during repository unpack, disabling repository",) + self.output( # scrive 2 volte stessa roba (self.output()) "[%s] %s" % ( brown(str(repo_tuple)), mytxt,