1 |
commit: 5d371987379f32b84651992846fed8f50a59254e |
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 15:42:43 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5d371987 |
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 the new start script. |
12 |
|
13 |
--- |
14 |
pym/repoman/main.py | 15 +-------------- |
15 |
1 file changed, 1 insertion(+), 14 deletions(-) |
16 |
|
17 |
diff --git a/pym/repoman/main.py b/pym/repoman/main.py |
18 |
index dfe188d..dfdf6ad 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 |
@@ -210,7 +198,6 @@ if repolevel == 1: |
41 |
else: |
42 |
startdir = normalize_path(mydir) |
43 |
startdir = os.path.join(repo_settings.repodir, *startdir.split(os.sep)[-2 - repolevel + 3:]) |
44 |
- |
45 |
################### |
46 |
|
47 |
# get lists of valid keywords, licenses, and use |
48 |
@@ -299,7 +286,7 @@ for xpkg in effective_scanlist: |
49 |
if manifester.run(checkdir, portdb): |
50 |
continue |
51 |
if not manifester.generated_manifest: |
52 |
- manifester.digest_check(checkdir) |
53 |
+ manifester.digest_check(xpkg, checkdir) |
54 |
###################### |
55 |
|
56 |
if options.mode == 'manifest-check': |