From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rcu59-0001js-4j for garchives@archives.gentoo.org; Tue, 20 Dec 2011 07:25:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A483521C080; Tue, 20 Dec 2011 07:25:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 78E9821C080 for ; Tue, 20 Dec 2011 07:25:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCC681B4014 for ; Tue, 20 Dec 2011 07:25:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1CC0D80042 for ; Tue, 20 Dec 2011 07:25:42 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <5f5f54b524b22e85c14539a9bb2ce52c7a4e312b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5f5f54b524b22e85c14539a9bb2ce52c7a4e312b Date: Tue, 20 Dec 2011 07:25:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: aa969872-69f8-4032-b6ec-9111be467891 X-Archives-Hash: 7381399e2810a30384a9e3afe12fc2bc commit: 5f5f54b524b22e85c14539a9bb2ce52c7a4e312b Author: Zac Medico gentoo org> AuthorDate: Tue Dec 20 07:24:38 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Dec 20 07:24:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5f5f54b5 Force COLUMNS > 0 for bug #394091. --- 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 37aead0..3c0d023 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=3DNo= ne, settings=3DNone, columns =3D os.environ.get("COLUMNS") if columns is None: rows, columns =3D 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 =3D 80 columns =3D str(columns) os.environ["COLUMNS"] =3D columns mysettings["COLUMNS"] =3D columns