From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CAD6A1387FF for ; Tue, 21 Oct 2014 05:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4869E08A5; Tue, 21 Oct 2014 05:05:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDBBDE087A for ; Tue, 21 Oct 2014 05:05:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C427F34030C for ; Tue, 21 Oct 2014 05:05:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 655038619 for ; Tue, 21 Oct 2014 05:05:08 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1413867848.9f29c4426cee96fc22be4fb1a9aab3e2960417fc.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/emaint/modules/sync/, pym/portage/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/emaint/modules/sync/sync.py pym/portage/sync/controller.py X-VCS-Directories: pym/portage/sync/ pym/portage/emaint/modules/sync/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9f29c4426cee96fc22be4fb1a9aab3e2960417fc X-VCS-Branch: plugin-sync Date: Tue, 21 Oct 2014 05:05:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 18b93002-2e3d-48ff-9166-ffb7c356971f X-Archives-Hash: f6e2b5f5d28de18499f82666dd108be7 commit: 9f29c4426cee96fc22be4fb1a9aab3e2960417fc Author: Brian Dolbec gentoo org> AuthorDate: Fri Sep 5 20:08:36 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 21 05:04:08 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9f29c442 portage/sync/controller.sync(): Migrate writemsg() call to return the error message to caller Highlight the "ERROR" string portion usig bad(), remove 1 linefeed. This puts the error in the emaint sync message list. --- pym/portage/emaint/modules/sync/sync.py | 6 +++--- pym/portage/sync/controller.py | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pym/portage/emaint/modules/sync/sync.py b/pym/portage/emaint/modules/sync/sync.py index 9b0d82c..4369a2a 100644 --- a/pym/portage/emaint/modules/sync/sync.py +++ b/pym/portage/emaint/modules/sync/sync.py @@ -179,11 +179,11 @@ class SyncRepos(object): sync_manager = get_syncer(self.emerge_config.target_config.settings, emergelog) retvals = [] for repo in selected_repos: - #print("syncing repo:", repo.name) if repo.sync_type is not None: - returncode = sync_manager.sync(self.emerge_config, repo) - #if returncode != os.EX_OK: + returncode, message = sync_manager.sync(self.emerge_config, repo) retvals.append((repo.name, returncode)) + if message: + msgs.append(message) # Reload the whole config. portage._sync_mode = False diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py index 2b3dbad..e8fe291 100644 --- a/pym/portage/sync/controller.py +++ b/pym/portage/sync/controller.py @@ -103,14 +103,13 @@ class SyncManager(object): if repo.sync_type in self.module_names[1:]: tasks = [self.module_controller.get_class(repo.sync_type)] else: - portage.util.writemsg( - "\nERROR: Sync module '%s' is not an installed/known type'\n\n" - % (repo.sync_type), noiselevel=-1) - return self.exitcode + msg = "\n%s: Sync module '%s' is not an installed/known type'\n" \ + % (bad("ERROR"), repo.sync_type) + return self.exitcode, msg rval = self.pre_sync(repo) if rval != os.EX_OK: - return rval + return rval, None # need to pass the kwargs dict to the modules # so they are available if needed. @@ -131,7 +130,7 @@ class SyncManager(object): self.perform_post_sync_hook(repo.sync_uri) - return self.exitcode + return self.exitcode, None def do_callback(self, result): @@ -167,7 +166,7 @@ class SyncManager(object): except OSError: st = None if st is None: - print(">>> '%s' not found, creating it." % repo.location) + writemsg_level(">>> '%s' not found, creating it." % repo.location) portage.util.ensure_dirs(repo.location, mode=0o755) st = os.stat(repo.location)