summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-08-30 12:12:50 +0200
committerZac Medico <zmedico@gentoo.org>2011-08-30 09:25:54 -0700
commit41f12443efdab544ace9f2c90df516360ebf9df1 (patch)
tree9336058f33249e147f04d39f143a602cb81540d5 /pym
parent719f41de41ad6f501842b35a09472130e9c11653 (diff)
downloadportage-41f12443efdab544ace9f2c90df516360ebf9df1.tar.gz
portage-41f12443efdab544ace9f2c90df516360ebf9df1.tar.bz2
portage-41f12443efdab544ace9f2c90df516360ebf9df1.zip
repoman: discard STDERR output from CVS.
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=373669
Diffstat (limited to 'pym')
-rw-r--r--pym/repoman/utilities.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 232739ea0..380f8edb5 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -60,7 +60,7 @@ def detect_vcs_conflicts(options, vcs):
if vcs == 'cvs':
logging.info("Performing a " + output.green("cvs -n up") + \
" with a little magic grep to check for updates.")
- retval = subprocess_getstatusoutput("cvs -n up 2>&1 | " + \
+ retval = subprocess_getstatusoutput("cvs -n up 2>/dev/null | " + \
"egrep '^[^\?] .*' | " + \
"egrep -v '^. .*/digest-[^/]+|^cvs server: .* -- ignored$'")
if vcs == 'svn':