From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E68C81399CE for ; Thu, 3 Sep 2015 18:03:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29313141E1; Thu, 3 Sep 2015 18:03:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDEA5141E1 for ; Thu, 3 Sep 2015 18:03:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A34983408E5 for ; Thu, 3 Sep 2015 18:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4340F170 for ; Thu, 3 Sep 2015 18:03:28 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1441303209.19b17fa0ecd633e2e0d759bc03a74c88c261b44b.vapier@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 19b17fa0ecd633e2e0d759bc03a74c88c261b44b X-VCS-Branch: master Date: Thu, 3 Sep 2015 18:03:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a3fa009-3205-48e5-8263-728fde20e356 X-Archives-Hash: 525a68dd904bcc1240b9997a65c45289 commit: 19b17fa0ecd633e2e0d759bc03a74c88c261b44b Author: Mike Frysinger gentoo org> AuthorDate: Thu Sep 3 18:00:09 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Sep 3 18:00:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=19b17fa0 Scheduler: clean up PORTAGE_TMPDIR warning message The current textwrap logic produces bad output when expanding the user's PORTAGE_TMPDIR variable. It's customary to not wrap literal values like this, especially when it's a user setting, so drop the use of textwrap. Before: * The directory specified in your PORTAGE_TMPDIR variable, '/var/tmp/som * e/really/long/path/that/looks/bad/when/you/break/it/up/but/do/it/anywa * ys', does not exist. Please create this directory or correct your * PORTAGE_TMPDIR setting. After: * The directory specified in your PORTAGE_TMPDIR variable does not exist: * /var/tmp/some/really/long/path/that/looks/bad/when/you/break/it/up/but/do/it/anyways * Please create this directory or correct your PORTAGE_TMPDIR setting. pym/_emerge/Scheduler.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 13abc92..8eeef06 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -963,11 +963,11 @@ class Scheduler(PollScheduler): # for ensuring sane $PWD (bug #239560) and storing elog messages. tmpdir = root_config.settings.get("PORTAGE_TMPDIR", "") if not tmpdir or not os.path.isdir(tmpdir): - msg = "The directory specified in your " + \ - "PORTAGE_TMPDIR variable, '%s', " % tmpdir + \ - "does not exist. Please create this " + \ - "directory or correct your PORTAGE_TMPDIR setting." - msg = textwrap.wrap(msg, 70) + msg = ( + 'The directory specified in your PORTAGE_TMPDIR variable does not exist:', + tmpdir, + 'Please create this directory or correct your PORTAGE_TMPDIR setting.', + ) out = portage.output.EOutput() for l in msg: out.eerror(l)