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 CC0361381F3 for ; Fri, 23 Aug 2013 13:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD674E0C27; Fri, 23 Aug 2013 13:52:10 +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 6A743E0C25 for ; Fri, 23 Aug 2013 13:52: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 7618333EBD4 for ; Fri, 23 Aug 2013 13:52:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 80BDBE468F for ; Fri, 23 Aug 2013 13:52: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: <1377257058.6250f850bd4f8f9708a66df52b2388ebf1f403ba.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/defaultscript.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 6250f850bd4f8f9708a66df52b2388ebf1f403ba X-VCS-Branch: master Date: Fri, 23 Aug 2013 13:52: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: 3f1016ac-34bf-4ee7-8942-336d9ef4f3c8 X-Archives-Hash: 80ee7f5ff815a5d809f7f60b91716245 commit: 6250f850bd4f8f9708a66df52b2388ebf1f403ba Author: André Erdmann mailerd de> AuthorDate: Fri Aug 23 11:24:18 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Aug 23 11:24:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6250f850 main script, "apply_rules": show modifed deps --- roverlay/defaultscript.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/roverlay/defaultscript.py b/roverlay/defaultscript.py index 1373ee1..7ab2ad0 100644 --- a/roverlay/defaultscript.py +++ b/roverlay/defaultscript.py @@ -91,9 +91,16 @@ def run_script_main ( installed ): if len ( sys.argv ) < 2 or not sys.argv[0]: die ( "no executable specified.", DIE.USAGE ) + exe = sys.argv[1] + script_file = os.path.abspath ( exe ) + if os.path.isfile ( script_file ) or os.sep in exe: + exe = script_file + + print ( "X___", exe) + roverlay.core.default_helper_setup ( installed ) roverlay.tools.shenv.run_script_exec ( - sys.argv[1], "runscript", sys.argv[1:], use_path=True + exe, "runscript", sys.argv[1:], use_path=True ) # --- end of run_script_main (...) --- @@ -384,6 +391,24 @@ def run_apply_package_rules ( env ): for evar in evars: FH.write ( "* {}\n".format ( evar ) ) + if P.depconf: + FH.write ( "dependencies manipulated:\n" ) + for root_key, subdict in P.depconf.items(): + if subdict: + klen = max ( len(s) for s in subdict.keys() ) + + FH.write ( "* {k}\n".format ( k=root_key ) ) + for key, deplist in sorted ( + subdict.items(), key=( lambda kv: kv[0] ), + ): + for dep in deplist: + FH.write ( + " {key:<{l}} += \"{dep}\"\n".format ( + key=key, dep=dep, l=klen + ) + ) + + if P.modified_by_package_rules is not True: # ^ check needs to be changed when adding more trace actions FH.write ( "trace marks:\n" )