Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Fri, 30 Jan 2015 20:48:43
Message-Id: 1422650885.4832730f65748f5b0ce15622f612621be38e8c07.dolsen@gentoo
1 commit: 4832730f65748f5b0ce15622f612621be38e8c07
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 30 20:48:05 2015 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 30 20:48:05 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4832730f
7
8 portage/package/ebuild/doebuild.py: Whitespace cleanup
9
10 ---
11 pym/portage/package/ebuild/doebuild.py | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-)
13
14 diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
15 index 1ac5359..5dadb7f 100644
16 --- a/pym/portage/package/ebuild/doebuild.py
17 +++ b/pym/portage/package/ebuild/doebuild.py
18 @@ -67,7 +67,7 @@ from portage.util import apply_recursive_permissions, \
19 apply_secpass_permissions, noiselimit, normalize_path, \
20 writemsg, writemsg_stdout, write_atomic
21 from portage.util.cpuinfo import get_cpu_count
22 -from portage.util.lafilefixer import rewrite_lafile
23 +from portage.util.lafilefixer import rewrite_lafile
24 from portage.versions import _pkgsplit
25 from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
26 from _emerge.EbuildBuildDir import EbuildBuildDir
27 @@ -501,7 +501,7 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
28 """
29 Wrapper function that invokes specific ebuild phases through the spawning
30 of ebuild.sh
31 -
32 +
33 @param myebuild: name of the ebuild to invoke the phase on (CPV)
34 @type myebuild: String
35 @param mydo: Phase to run
36 @@ -544,13 +544,13 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
37 @return:
38 1. 0 for success
39 2. 1 for error
40 -
41 +
42 Most errors have an accompanying error message.
43 -
44 +
45 listonly and fetchonly are only really necessary for operations involving 'fetch'
46 prev_mtimes are only necessary for merge operations.
47 Other variables may not be strictly required, many have defaults that are set inside of doebuild.
48 -
49 +
50 """
51
52 if settings is None:
53 @@ -572,8 +572,8 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
54 if not tree:
55 writemsg("Warning: tree not specified to doebuild\n")
56 tree = "porttree"
57 -
58 - # chunked out deps for each phase, so that ebuild binary can use it
59 +
60 + # chunked out deps for each phase, so that ebuild binary can use it
61 # to collapse targets down.
62 actionmap_deps={
63 "pretend" : [],
64 @@ -588,7 +588,7 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
65 "package":["install"],
66 "merge" :["install"],
67 }
68 -
69 +
70 if mydbapi is None:
71 mydbapi = portage.db[myroot][tree].dbapi