diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index 021962197..a37e04435 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -154,7 +154,7 @@ class etpDatabase:
 
             # if we arrive here, it is because all the mirrors are unlocked
             self.ServiceInterface.MirrorsService.lock_mirrors(True, repo = self.server_repo)
-            self.ServiceInterface.MirrorsService.sync_databases(noUpload, repo = repo)
+            self.ServiceInterface.MirrorsService.sync_databases(noUpload, repo = self.server_repo)
 
     def closeDB(self):
 
@@ -266,7 +266,6 @@ class etpDatabase:
     def serverUpdatePackagesData(self):
 
         etpConst['treeupdatescalled'] = True
-        repository = self.server_repo
 
         repo_updates_file = self.ServiceInterface.get_local_database_treeupdates_file(self.server_repo)
         doRescan = False
diff --git a/libraries/entropy.py b/libraries/entropy.py
index 74a3e04f3..7ed1323c8 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -12595,7 +12595,7 @@ class ServerInterface(TextInterface):
 class ServerMirrorsInterface:
 
     import entropyTools, dumpTools
-    def __init__(self,  ServerInstance):
+    def __init__(self,  ServerInstance, repo = None):
 
         if not isinstance(ServerInstance,ServerInterface):
             raise exceptionTools.IncorrectParameter("IncorrectParameter: a valid ServerInterface based instance is needed")
@@ -12610,7 +12610,7 @@ class ServerMirrorsInterface:
             type = "info",
             header = red(" @@ ")
         )
-        for mirror in self.Entropy.get_remote_mirrors():
+        for mirror in self.Entropy.get_remote_mirrors(repo):
             mirror = self.entropyTools.hideFTPpassword(mirror)
             self.Entropy.updateProgress(
                 blue("mirror: %s") % (darkgreen(mirror),),