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 1QyR8n-0004wS-Vr for garchives@archives.gentoo.org; Tue, 30 Aug 2011 16:26:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFB2A21C105; Tue, 30 Aug 2011 16:26:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A493321C105 for ; Tue, 30 Aug 2011 16:26:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24F621B4160 for ; Tue, 30 Aug 2011 16:26:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 511FA80040 for ; Tue, 30 Aug 2011 16:26:13 +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: <41f12443efdab544ace9f2c90df516360ebf9df1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/utilities.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 41f12443efdab544ace9f2c90df516360ebf9df1 Date: Tue, 30 Aug 2011 16:26:13 +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: X-Archives-Hash: 3d83785e2e4eda1f26552c14197c716c commit: 41f12443efdab544ace9f2c90df516360ebf9df1 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue Aug 30 10:12:50 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Aug 30 16:25:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D41f12443 repoman: discard STDERR output from CVS. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=3D373669 --- pym/repoman/utilities.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index 232739e..380f8ed 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -60,7 +60,7 @@ def detect_vcs_conflicts(options, vcs): if vcs =3D=3D 'cvs': logging.info("Performing a " + output.green("cvs -n up") + \ " with a little magic grep to check for updates.") - retval =3D subprocess_getstatusoutput("cvs -n up 2>&1 | " + \ + retval =3D subprocess_getstatusoutput("cvs -n up 2>/dev/null | " + \ "egrep '^[^\?] .*' | " + \ "egrep -v '^. .*/digest-[^/]+|^cvs server: .* -- ignored$'") if vcs =3D=3D 'svn':