diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-11 08:22:11 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-11 08:22:11 -0700 |
| commit | 2c60ee5faad6f39162556820a4a67d2909e1a83d (patch) | |
| tree | c4620fcbb62200a284f5ef50ef5aae0e5ef135c3 | |
| parent | f8504d36c50bef4c1a982a4b9262d3e8e15f438b (diff) | |
| download | portage-2c60ee5faad6f39162556820a4a67d2909e1a83d.tar.gz portage-2c60ee5faad6f39162556820a4a67d2909e1a83d.tar.bz2 portage-2c60ee5faad6f39162556820a4a67d2909e1a83d.zip | |
prepare_build_dirs: warn for logdir permission
If there is insufficient permission to use PORT_LOGDIR or the required
subdirectory, warn instead of raising an exception. Also, fall back to
using $T/build.log as a last resort.
| -rw-r--r-- | pym/portage/package/ebuild/prepare_build_dirs.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py index 259bedf80..515319065 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -300,6 +300,7 @@ def _prepare_workdir(mysettings): if 'compress-build-logs' in mysettings.features: compress_log_ext = '.gz' + logdir_subdir_ok = False if "PORT_LOGDIR" in mysettings and \ os.access(mysettings["PORT_LOGDIR"], os.W_OK): logid_path = os.path.join(mysettings["PORTAGE_BUILDDIR"], ".logid") @@ -320,9 +321,19 @@ def _prepare_workdir(mysettings): (mysettings["CATEGORY"], mysettings["PF"], logid_time, compress_log_ext)) - ensure_dirs(os.path.dirname(mysettings["PORTAGE_LOG_FILE"])) + log_subdir = os.path.dirname(mysettings["PORTAGE_LOG_FILE"]) + try: + ensure_dirs(log_subdir) + except PortageException as e: + writemsg(_unicode_decode("!!! %s\n") % (e,), noiselevel=-1) + else: + if os.access(log_subdir, os.W_OK): + logdir_subdir_ok = True + else: + writemsg(_unicode_decode("!!! %s: %s\n") % + (_("Permission Denied"), log_subdir), noiselevel=-1) - else: + if not logdir_subdir_ok: # NOTE: When sesandbox is enabled, the local SELinux security policies # may not allow output to be piped out of the sesandbox domain. The # current policy will allow it to work when a pty is available, but |