diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:42:57 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-24 21:42:57 +0000 |
commit | 024c1538624e4d98c5f1f70fa74e93cf61df96b8 (patch) | |
tree | 57c8cd4748f5e293a343687265b236a9ff128597 | |
parent | 6a034713fb2ff9aa5be2349d001ce15161c50c60 (diff) | |
download | portage-024c1538624e4d98c5f1f70fa74e93cf61df96b8.tar.gz portage-024c1538624e4d98c5f1f70fa74e93cf61df96b8.tar.bz2 portage-024c1538624e4d98c5f1f70fa74e93cf61df96b8.zip |
return from the merge task instead of calling sys.exit directly. (trunk r6274:6275)
svn path=/main/branches/2.1.2/; revision=6276
-rwxr-xr-x | bin/emerge | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge index 684f2a978..794d785d9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2903,12 +2903,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")) |