| 1 |
commit: 41f12443efdab544ace9f2c90df516360ebf9df1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 10:12:50 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 16:25:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=41f12443 |
| 7 |
|
| 8 |
repoman: discard STDERR output from CVS. |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=373669 |
| 11 |
|
| 12 |
--- |
| 13 |
pym/repoman/utilities.py | 2 +- |
| 14 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py |
| 17 |
index 232739e..380f8ed 100644 |
| 18 |
--- a/pym/repoman/utilities.py |
| 19 |
+++ b/pym/repoman/utilities.py |
| 20 |
@@ -60,7 +60,7 @@ def detect_vcs_conflicts(options, vcs): |
| 21 |
if vcs == 'cvs': |
| 22 |
logging.info("Performing a " + output.green("cvs -n up") + \ |
| 23 |
" with a little magic grep to check for updates.") |
| 24 |
- retval = subprocess_getstatusoutput("cvs -n up 2>&1 | " + \ |
| 25 |
+ retval = subprocess_getstatusoutput("cvs -n up 2>/dev/null | " + \ |
| 26 |
"egrep '^[^\?] .*' | " + \ |
| 27 |
"egrep -v '^. .*/digest-[^/]+|^cvs server: .* -- ignored$'") |
| 28 |
if vcs == 'svn': |
Archives