commit: 9b3d5b8544074c62ed30a45484039f9c18457a8d
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 14:23:26 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> 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':
