From 4080744f697ac2b0dd8bd2e5a48050632568d8e8 Mon Sep 17 00:00:00 2001 From: lxnay Date: Tue, 20 May 2008 17:10:59 +0000 Subject: [PATCH] Entropy/ServerInterface: - make dependencies_test() a blocker git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1954 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy.py | 15 +++++++++++++++ server/server_reagent.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libraries/entropy.py b/libraries/entropy.py index c7b954a03..9e2789fcd 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -15961,6 +15961,21 @@ class ServerMirrorsInterface: if upload_queue and not no_upload: + deps_not_found = self.Entropy.dependencies_test() + if deps_not_found: + self.Entropy.updateProgress( + "[repo:%s|%s] %s: %s" % ( + brown(repo), + red(_("sync")), + blue(_("database sync forbidden")), + red(_("dependencies_test() reported errors")), + ), + importance = 1, + type = "error", + header = darkred(" !!! ") + ) + return 3,set(),set() + uris = [x[0] for x in upload_queue] errors, fine_uris, broken_uris = self.upload_database(uris, repo = repo) if errors: diff --git a/server/server_reagent.py b/server/server_reagent.py index c6e4afa80..6b1c7cf41 100644 --- a/server/server_reagent.py +++ b/server/server_reagent.py @@ -477,7 +477,7 @@ def database(options): print_info(green(" * ")+red("%s..." % (_("Bumping Repository database"),) )) Entropy.bump_database() if databaseRequestSync: - Entropy.MirrorsService.sync_databases() + errors, fine, broken = Entropy.MirrorsService.sync_databases() def spm(options):