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 BDE4A1389E2 for ; Thu, 4 Dec 2014 20:04:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7DFBE08EA; Thu, 4 Dec 2014 20:04:36 +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 074A9E08C5 for ; Thu, 4 Dec 2014 20:04:36 +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 42508340581 for ; Thu, 4 Dec 2014 20:04:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8A5CB936 for ; Thu, 4 Dec 2014 20:04:30 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1417722993.f51290f5c93eff9d4167ee01792a50172989c375.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/__init__.py pym/portage/sync/config_checks.py X-VCS-Directories: pym/portage/sync/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f51290f5c93eff9d4167ee01792a50172989c375 X-VCS-Branch: plugin-sync Date: Thu, 4 Dec 2014 20:04:30 +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: b26d9cd9-c797-45d7-ae6f-401d711a3261 X-Archives-Hash: 60a9fa34d4ded1e6bf487e5260cb0361 commit: f51290f5c93eff9d4167ee01792a50172989c375 Author: Brian Dolbec gentoo org> AuthorDate: Tue Jun 17 18:44:43 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Dec 4 19:56:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f51290f5 portage/sync: Add additional output info for unsupported sync-types Comment out some debug print()'s --- pym/portage/sync/__init__.py | 5 +++-- pym/portage/sync/config_checks.py | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/portage/sync/__init__.py b/pym/portage/sync/__init__.py index 6d2a732..b74c89e 100644 --- a/pym/portage/sync/__init__.py +++ b/pym/portage/sync/__init__.py @@ -11,12 +11,12 @@ sync_manager = None path = os.path.join(os.path.dirname(__file__), "modules") # initial development debug info -print("module path:", path) +#print("module path:", path) module_controller = Modules(path=path, namepath="portage.sync.modules") # initial development debug info -print(module_controller.module_names) +#print(module_controller.module_names) module_names = module_controller.module_names[:] @@ -43,6 +43,7 @@ def get_syncer(settings=None, logger=None): def validate_config(repo, logger): '''Validate the repos.conf settings for the repo''' + global module_names, module_controller if not check_type(repo, logger, module_names): return False diff --git a/pym/portage/sync/config_checks.py b/pym/portage/sync/config_checks.py index 8ef1974..db316aa 100644 --- a/pym/portage/sync/config_checks.py +++ b/pym/portage/sync/config_checks.py @@ -26,6 +26,10 @@ def check_type(repo, logger, module_names): _("Repository '%s' has sync-type attribute set to unsupported value: '%s'") % (repo.name, repo.sync_type), level=logger.ERROR, noiselevel=-1) + writemsg_level("!!! %s\n" % + _("Installed sync-types are: '%s'") + % (str(module_names)), + level=logger.ERROR, noiselevel=-1) return False return True 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 563741389E2 for ; Thu, 4 Dec 2014 20:16:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F2A8E0853; Thu, 4 Dec 2014 20:16:13 +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 57FDAE07F2 for ; Thu, 4 Dec 2014 20:16:12 +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 82748340598 for ; Thu, 4 Dec 2014 20:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28784B93B for ; Thu, 4 Dec 2014 20:16:10 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1417722993.f51290f5c93eff9d4167ee01792a50172989c375.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/__init__.py pym/portage/sync/config_checks.py X-VCS-Directories: pym/portage/sync/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f51290f5c93eff9d4167ee01792a50172989c375 X-VCS-Branch: master Date: Thu, 4 Dec 2014 20:16:10 +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: afa541dd-f60d-413d-bac4-aaf2bda69f1d X-Archives-Hash: 1f918aaef880bd3795aee1d288c0c268 Message-ID: <20141204201610.cic3n1vcXhQlLfRiOgmvM7dQk8Aecdcfr_y1Zzjj1NI@z> commit: f51290f5c93eff9d4167ee01792a50172989c375 Author: Brian Dolbec gentoo org> AuthorDate: Tue Jun 17 18:44:43 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Dec 4 19:56:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f51290f5 portage/sync: Add additional output info for unsupported sync-types Comment out some debug print()'s --- pym/portage/sync/__init__.py | 5 +++-- pym/portage/sync/config_checks.py | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/portage/sync/__init__.py b/pym/portage/sync/__init__.py index 6d2a732..b74c89e 100644 --- a/pym/portage/sync/__init__.py +++ b/pym/portage/sync/__init__.py @@ -11,12 +11,12 @@ sync_manager = None path = os.path.join(os.path.dirname(__file__), "modules") # initial development debug info -print("module path:", path) +#print("module path:", path) module_controller = Modules(path=path, namepath="portage.sync.modules") # initial development debug info -print(module_controller.module_names) +#print(module_controller.module_names) module_names = module_controller.module_names[:] @@ -43,6 +43,7 @@ def get_syncer(settings=None, logger=None): def validate_config(repo, logger): '''Validate the repos.conf settings for the repo''' + global module_names, module_controller if not check_type(repo, logger, module_names): return False diff --git a/pym/portage/sync/config_checks.py b/pym/portage/sync/config_checks.py index 8ef1974..db316aa 100644 --- a/pym/portage/sync/config_checks.py +++ b/pym/portage/sync/config_checks.py @@ -26,6 +26,10 @@ def check_type(repo, logger, module_names): _("Repository '%s' has sync-type attribute set to unsupported value: '%s'") % (repo.name, repo.sync_type), level=logger.ERROR, noiselevel=-1) + writemsg_level("!!! %s\n" % + _("Installed sync-types are: '%s'") + % (str(module_names)), + level=logger.ERROR, noiselevel=-1) return False return True