diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-19 23:24:38 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-19 23:24:38 -0800 |
| commit | 5f5f54b524b22e85c14539a9bb2ce52c7a4e312b (patch) | |
| tree | 99301db70dceb1be6f28c4b8f7c09ec15f23a2d0 | |
| parent | b135c01eff4ea89d16ae711271cc215388d08d17 (diff) | |
| download | portage-5f5f54b524b22e85c14539a9bb2ce52c7a4e312b.tar.gz portage-5f5f54b524b22e85c14539a9bb2ce52c7a4e312b.tar.bz2 portage-5f5f54b524b22e85c14539a9bb2ce52c7a4e312b.zip | |
Force COLUMNS > 0 for bug #394091.
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 37aead0f3..3c0d023d4 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -313,6 +313,10 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, columns = os.environ.get("COLUMNS") if columns is None: rows, columns = portage.output.get_term_size() + if columns < 1: + # Force a sane value for COLUMNS, so that tools + # like ls don't complain (see bug #394091). + columns = 80 columns = str(columns) os.environ["COLUMNS"] = columns mysettings["COLUMNS"] = columns |