diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:42:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:42:26 +0000 |
| commit | f798fc3d48328a3f1847e0207444794549e8bb49 (patch) | |
| tree | ecebaee5c137ee5eaff3cc03800ba9d51dd92b9c | |
| parent | 6fef0444c727b18e9a768187e2c96a2db428d1c8 (diff) | |
| download | portage-f798fc3d48328a3f1847e0207444794549e8bb49.tar.gz portage-f798fc3d48328a3f1847e0207444794549e8bb49.tar.bz2 portage-f798fc3d48328a3f1847e0207444794549e8bb49.zip | |
return from the merge task instead of calling sys.exit directly.
svn path=/main/trunk/; revision=6275
| -rw-r--r-- | pym/emerge/__init__.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index b99ff2724..495019d7c 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2931,12 +2931,7 @@ class MergeTask(object): print "!!! Please use 'emerge --pretend' to determine blockers." if "--quiet" not in self.myopts: show_blocker_docs_link() - if "--pretend" not in self.myopts: - try: - del mtimedb["resume"] - except KeyError: - pass - sys.exit(1) + return 1 #buildsyspkg: I need mysysdict also on resume (moved from the else block) mysysdict = genericdict(getlist(self.settings, "system")) |