From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SjXvG-0008SG-Bl for garchives@archives.gentoo.org; Tue, 26 Jun 2012 15:43:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 612C9E0DDA; Tue, 26 Jun 2012 15:43:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 22FA6E0DDA for ; Tue, 26 Jun 2012 15:43:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 879F91B4595 for ; Tue, 26 Jun 2012 15:42:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 68837E5445 for ; Tue, 26 Jun 2012 15:42:56 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1340725323.9ee8e2b549ccbcd321ce4344bcc5a20a14f01025.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/config/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/config/entrymap.py X-VCS-Directories: roverlay/config/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 9ee8e2b549ccbcd321ce4344bcc5a20a14f01025 X-VCS-Branch: master Date: Tue, 26 Jun 2012 15:42:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a440568a-9c5b-4906-85fb-a023e2a2d069 X-Archives-Hash: 30adc99a9f65f994a7bd9d6ec1f0b77c commit: 9ee8e2b549ccbcd321ce4344bcc5a20a14f01025 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Tue Jun 26 15:42:03 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Tue Jun 26 15:42:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3D9ee8e2b5 config entry map update --- roverlay/config/entrymap.py | 117 +++++++++++++++++++++++++++++--------= ------ 1 files changed, 79 insertions(+), 38 deletions(-) diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py index 966ac2d..2cb7077 100644 --- a/roverlay/config/entrymap.py +++ b/roverlay/config/entrymap.py @@ -32,59 +32,100 @@ # with a colon 'list:yesno', which is parsed in a left-to-right order. # Nested subtypes such as list:slist:int:fs_file:list may lead to erro= rs. # + +fs_file =3D 'fs_file' +fs_abslist =3D 'slist:fs_abs' + +# often (>1) used entry dicts (it's ok to share a ref to those dicts +# 'cause CONFIG_ENTRY_MAP won't be modified) +is_fs_file =3D { 'value_type' : fs_file } +is_str =3D { 'value_type' : 'str' } + +only_vtype =3D lambda x : { 'value_type': x } + CONFIG_ENTRY_MAP =3D dict ( - log_level =3D '', - log_console =3D dict ( - value_type =3D 'yesno', - ), + + # =3D=3D logging =3D=3D + + log_level =3D '', + log_console =3D only_vtype ( 'yesno' ), log_file =3D dict ( # setting path to LOG.FILE.main to avoid collision with LOG.FILE.* - path =3D [ 'LOG', 'FILE', 'Main' ], - value_type =3D 'fs_file', - ), - log_file_resolved =3D dict ( - value_type =3D 'fs_file', - ), - log_file_unresolvable =3D dict ( - value_type =3D 'fs_file', - ), - ebuild_header =3D dict ( - value_type =3D 'fs_file', - ), - overlay_category =3D dict ( - value_type =3D 'str', + path =3D [ 'LOG', 'FILE', 'main' ], + value_type =3D fs_file, ), + log_file_resolved =3D is_fs_file, + log_file_unresolvable =3D is_fs_file, + + # --- logging + + + # =3D=3D overlay =3D=3D + + # FIXME key is not in use + ebuild_header =3D is_fs_file, + + overlay_category =3D is_str, # e.g. 'sci-R' + overlay_dir =3D only_vtype ( 'fs_abs:fs_dir' ), + overlay_eclass =3D dict ( path =3D [ 'OVERLAY', 'eclass_files' ], - value_type =3D 'list:fs_abs:fs_file', + value_type =3D fs_abslist, ), - eclass =3D 'overlay_eclass', - overlay_dir =3D dict ( - value_type =3D 'fs_abs:fs_dir', - ), - overlay_name =3D dict ( - value_type =3D 'str', + + overlay_name =3D is_str, + + # ebuild is used to create Manifest files + ebuild_prog =3D dict ( + path =3D [ 'TOOLS', 'ebuild_prog' ], + value_type =3D 'fs_path', ), - distfiles_dir =3D dict ( - value_type =3D 'fs_dir', + + # * alias + eclass =3D 'overlay_eclass', + + # --- overlay + + + # =3D=3D remote =3D=3D + + # the distfiles root directory + # this is where repos create their own DISTDIR as sub directory unless + # they specify another location + distfiles_root =3D only_vtype ( 'fs_dir' ), + + # the repo config file(s) + repo_config_files =3D dict ( + path =3D [ 'REPO', 'config_files' ], + value_type =3D fs_abslist, ), + + # this option is used to limit bandwidth usage while running rsync rsync_bwlimit =3D dict ( path =3D [ 'rsync_bwlimit' ], value_type =3D 'int', ), - ebuild_prog =3D dict ( - path =3D [ 'TOOLS', 'ebuild_prog' ], - value_type =3D 'fs_path', - ), + + # * alias + distfiles =3D 'distfiles_root', + distdir =3D 'distfiles_root', + repo_config =3D 'repo_config_files', + repo_config_file =3D 'repo_config_files', + + # --- remote + + + # =3D=3D dependency resolution =3D=3D + + # the list of simple dep rule files simple_rules_files =3D dict ( path =3D [ 'DEPRES', 'SIMPLE_RULES', 'files' ], - value_type =3D 'list:fs_abs', + value_type =3D fs_abslist, ), + + # * alias simple_rules_file =3D 'simple_rules_files', - repo_config =3D 'repo_config_files', - repo_config_file =3D 'repo_config_files', - repo_config_files =3D dict ( - path =3D [ 'REPO', 'config_files' ], - value_type =3D 'slist:fs_abs', - ), + + # --- dependency resolution + )