diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-04-02 13:14:14 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-04-02 13:14:14 -0700 |
| commit | 27ae77a5977741bcad9b0cb9323812de9fc1515b (patch) | |
| tree | 2c94226d3dba9e68da6b729e5e81b9970e6fcb40 /pym/portage | |
| parent | Add a test which calls bash -n on all scripts with bash shebang. (diff) | |
| parent | Implement emerge part of pkg_pretend (diff) | |
| download | portage-idfetch-27ae77a5977741bcad9b0cb9323812de9fc1515b.tar.gz portage-idfetch-27ae77a5977741bcad9b0cb9323812de9fc1515b.tar.bz2 portage-idfetch-27ae77a5977741bcad9b0cb9323812de9fc1515b.zip | |
Merge remote branch 'fews-portage-branch/pkg_pretend'
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/const.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 1450fe2e..4171b999 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -80,7 +80,7 @@ INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", "CONFIG_PROTECT_MASK", "CONFIG_PROTECT", "PRELINK_PATH", "PRELINK_PATH_MASK", "PROFILE_ONLY_VARIABLES") -EBUILD_PHASES = ("setup", "unpack", "prepare", "configure", +EBUILD_PHASES = ("pretend", "setup", "unpack", "prepare", "configure", "compile", "test", "install", "package", "preinst", "postinst","prerm", "postrm", "nofetch", "config", "info", "other") diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index e5716f0a..b64e10d4 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -301,7 +301,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, fetchonly=0, cleanup=0, dbkey=None, use_cache=1, fetchall=0, tree=None, mydbapi=None, vartree=None, prev_mtimes=None, fd_pipes=None, returnpid=False): - """ Wrapper function that invokes specific ebuild phases through the spawning of ebuild.sh @@ -523,7 +522,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, # we can temporarily override PORTAGE_TMPDIR with a random temp dir # so that there's no need for locking and it can be used even if the # user isn't in the portage group. - if mydo in ("info",): + if mydo in ("info", "pretend"): tmpdir = tempfile.mkdtemp() tmpdir_orig = mysettings["PORTAGE_TMPDIR"] mysettings["PORTAGE_TMPDIR"] = tmpdir @@ -785,7 +784,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, writemsg(_("!!! post postinst failed; exiting.\n"), noiselevel=-1) return phase_retval - elif mydo in ("prerm", "postrm", "config", "info"): + elif mydo in ("prerm", "postrm", "config", "info", "pretend"): retval = spawn( _shell_quote(ebuild_sh_binary) + " " + mydo, mysettings, debug=debug, free=1, logfile=logfile, |