Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/
Date: Mon, 02 Jun 2014 14:24:34
Message-Id: 1401719034.9b3d5b8544074c62ed30a45484039f9c18457a8d.dol-sen@gentoo
1 commit: 9b3d5b8544074c62ed30a45484039f9c18457a8d
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 2 14:23:26 2014 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Mon Jun 2 14:23:54 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9b3d5b85
7
8 repoman/main.py: Remove the exit_handler() and intialization
9
10 This script is no longer the start script.
11 There is a handler in hte new start script.
12
13 ---
14 pym/repoman/main.py | 17 +++--------------
15 1 file changed, 3 insertions(+), 14 deletions(-)
16
17 diff --git a/pym/repoman/main.py b/pym/repoman/main.py
18 index dfe188d..c5a6ea6 100755
19 --- a/pym/repoman/main.py
20 +++ b/pym/repoman/main.py
21 @@ -96,18 +96,6 @@ if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
22 not sys.stdout.isatty():
23 nocolor()
24
25 -
26 -def exithandler(signum=None, _frame=None):
27 - logging.fatal("Interrupted; exiting...")
28 - if signum is None:
29 - sys.exit(1)
30 - else:
31 - sys.exit(128 + signum)
32 -
33 -
34 -signal.signal(signal.SIGINT, exithandler)
35 -
36 -
37 options, arguments = parse_args(
38 sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", ""))
39
40 @@ -205,12 +193,13 @@ if options.mode == 'commit':
41
42 # Make startdir relative to the canonical repodir, so that we can pass
43 # it to digestgen and it won't have to be canonicalized again.
44 +print("REPOLEVEL:", repolevel)
45 if repolevel == 1:
46 startdir = repo_settings.repodir
47 else:
48 startdir = normalize_path(mydir)
49 startdir = os.path.join(repo_settings.repodir, *startdir.split(os.sep)[-2 - repolevel + 3:])
50 -
51 +print("STARTDIR:", startdir)
52 ###################
53
54 # get lists of valid keywords, licenses, and use
55 @@ -299,7 +288,7 @@ for xpkg in effective_scanlist:
56 if manifester.run(checkdir, portdb):
57 continue
58 if not manifester.generated_manifest:
59 - manifester.digest_check(checkdir)
60 + manifester.digest_check(xpkg, checkdir)
61 ######################
62
63 if options.mode == 'manifest-check':