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 BDCBB1393E9 for ; Mon, 2 Jun 2014 14:24:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39BC0E0951; Mon, 2 Jun 2014 14:24:32 +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 B7D13E0951 for ; Mon, 2 Jun 2014 14:24:31 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8830933FE9F for ; Mon, 2 Jun 2014 14:24:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 366EA182D4 for ; Mon, 2 Jun 2014 14:24:29 +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: <1401719034.9b3d5b8544074c62ed30a45484039f9c18457a8d.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/main.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 9b3d5b8544074c62ed30a45484039f9c18457a8d X-VCS-Branch: repoman Date: Mon, 2 Jun 2014 14:24:29 +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: bda4ea90-a2e6-450a-a3f4-f4c58da895af X-Archives-Hash: 3f65935537ee11398fa24b0b3c2a2e5f commit: 9b3d5b8544074c62ed30a45484039f9c18457a8d Author: Brian Dolbec gentoo org> AuthorDate: Mon Jun 2 14:23:26 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Jun 2 14:23:54 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9b3d5b85 repoman/main.py: Remove the exit_handler() and intialization This script is no longer the start script. There is a handler in hte new start script. --- pym/repoman/main.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index dfe188d..c5a6ea6 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -96,18 +96,6 @@ if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ not sys.stdout.isatty(): nocolor() - -def exithandler(signum=None, _frame=None): - logging.fatal("Interrupted; exiting...") - if signum is None: - sys.exit(1) - else: - sys.exit(128 + signum) - - -signal.signal(signal.SIGINT, exithandler) - - options, arguments = parse_args( sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", "")) @@ -205,12 +193,13 @@ if options.mode == 'commit': # Make startdir relative to the canonical repodir, so that we can pass # it to digestgen and it won't have to be canonicalized again. +print("REPOLEVEL:", repolevel) if repolevel == 1: startdir = repo_settings.repodir else: startdir = normalize_path(mydir) startdir = os.path.join(repo_settings.repodir, *startdir.split(os.sep)[-2 - repolevel + 3:]) - +print("STARTDIR:", startdir) ################### # get lists of valid keywords, licenses, and use @@ -299,7 +288,7 @@ for xpkg in effective_scanlist: if manifester.run(checkdir, portdb): continue if not manifester.generated_manifest: - manifester.digest_check(checkdir) + manifester.digest_check(xpkg, checkdir) ###################### if options.mode == 'manifest-check':