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 C93731381F3 for ; Fri, 12 Jul 2013 13:57:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3328FE09DA; Fri, 12 Jul 2013 13:57:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D6D6E09D5 for ; Fri, 12 Jul 2013 13:57:05 +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 1F28833E725 for ; Fri, 12 Jul 2013 13:57:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9299CE5464 for ; Fri, 12 Jul 2013 13:57:01 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1373636865.55b83ffd569c0c3ce9ae46e6198805873864e8a4.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/__init__.py roverlay/main.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 55b83ffd569c0c3ce9ae46e6198805873864e8a4 X-VCS-Branch: gsoc13/next Date: Fri, 12 Jul 2013 13:57:01 +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: c27ad20d-3174-49b2-9c1d-3e372332a988 X-Archives-Hash: 319cbc4bd2256c8a9a4fc68cfb9867af Message-ID: <20130712135701.4mLx5Spmh4mheuV0L99wBjKoKo__US8J3wt1RdGpQpA@z> commit: 55b83ffd569c0c3ce9ae46e6198805873864e8a4 Author: André Erdmann mailerd de> AuthorDate: Fri Jul 12 13:47:45 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Jul 12 13:47:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=55b83ffd roverlay, setupdirs command: dont load field def --- roverlay/__init__.py | 27 ++++++++++++++++----------- roverlay/main.py | 2 ++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/roverlay/__init__.py b/roverlay/__init__.py index 175f2d1..f660a4a 100644 --- a/roverlay/__init__.py +++ b/roverlay/__init__.py @@ -30,17 +30,21 @@ def setup_initial_logger(): """Sets up initial logging.""" roverlay.recipe.easylogger.setup_initial() -def load_config_file ( cfile, extraconf=None, setup_logger=True ): +def load_config_file ( + cfile, extraconf=None, setup_logger=True, load_main_only=False +): """ Loads the config, including the field definition file. Sets up the logger afterwards. (Don't call this method more than once.) arguments: - * cfile -- path to the config file - * extraconf -- a dict with additional config entries that will override - entries read from cfile - * setup_logger -- set up logger (defaults to True) + * cfile -- path to the config file + * extraconf -- a dict with additional config entries that will override + entries read from cfile + * setup_logger -- set up logger (defaults to True) + * load_main_only -- if set and True: load main config file only + (= do not load field def, ...) """ roverlay_config = roverlay.config.access() @@ -55,12 +59,13 @@ def load_config_file ( cfile, extraconf=None, setup_logger=True ): if setup_logger: roverlay.recipe.easylogger.setup ( roverlay_config ) - confloader.load_field_definition ( - roverlay_config.get_or_fail ( "DESCRIPTION.field_definition_file" ) - ) + if not load_main_only: + confloader.load_field_definition ( + roverlay_config.get_or_fail ( "DESCRIPTION.field_definition_file" ) + ) - confloader.load_use_expand_map ( - roverlay_config.get ( "EBUILD.USE_EXPAND.rename_file" ) - ) + confloader.load_use_expand_map ( + roverlay_config.get ( "EBUILD.USE_EXPAND.rename_file" ) + ) return roverlay_config diff --git a/roverlay/main.py b/roverlay/main.py index 75d1e2f..0fec74d 100644 --- a/roverlay/main.py +++ b/roverlay/main.py @@ -101,6 +101,7 @@ def run_setupdirs ( config, target_uid, target_gid ): os.path.dirname ( value.rstrip ( os.sep ) ) if dirmask & WANT_FILEDIR else value.rstrip ( os.sep ) ) + if dirpath: dodir ( dirpath ) if dirmask & WANT_PRIVATE: @@ -459,6 +460,7 @@ def main ( config_file, extraconf=additional_config, setup_logger=want_logging, + load_main_only=do_setupdirs, ) del config_file, additional_config except: