diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-12-30 21:38:26 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-12-30 21:38:26 +0000 |
commit | a8ed41c477e4dc13ff51d61ffee8ac7d8cdd0602 (patch) | |
tree | 17a013c05111bd79dae29f63ca82444a7432d76b /bin/emerge | |
parent | cac3e113678f215fcf66592ea45a743580cb7984 (diff) | |
download | portage-a8ed41c477e4dc13ff51d61ffee8ac7d8cdd0602.tar.gz portage-a8ed41c477e4dc13ff51d61ffee8ac7d8cdd0602.tar.bz2 portage-a8ed41c477e4dc13ff51d61ffee8ac7d8cdd0602.zip |
Use return values instead of direct sys.exit(123) calls when a merge fails.
svn path=/main/trunk/; revision=5432
Diffstat (limited to 'bin/emerge')
-rwxr-xr-x | bin/emerge | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 4865b2ce3..24f1f91d4 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3015,8 +3015,8 @@ class MergeTask(object): mydbapi=bindb, vartree=self.trees[myroot]["vartree"], prev_mtimes=ldpath_mtimes) - if retval is None: - sys.exit(1) + if retval != os.EX_OK: + return retval #need to check for errors if "--buildpkgonly" not in self.myopts: self.trees[x[1]]["vartree"].inject(x[2]) |