projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2217d9e
)
getstatusoutput comes from commands
author
Fabian Groffen
<grobian@gentoo.org>
Sun, 24 Feb 2008 00:09:42 +0000
(
00:09
-0000)
committer
Fabian Groffen
<grobian@gentoo.org>
Sun, 24 Feb 2008 00:09:42 +0000
(
00:09
-0000)
svn path=/main/branches/prefix/; revision=9376
pym/repoman/utilities.py
patch
|
blob
|
history
diff --git
a/pym/repoman/utilities.py
b/pym/repoman/utilities.py
index fc31afc88bf17e211063717a31db61789456c86a..b9553fbfb7d78184abcedfc978442d280e531408 100644
(file)
--- a/
pym/repoman/utilities.py
+++ b/
pym/repoman/utilities.py
@@
-45,7
+45,7
@@
def detect_vcs_conflicts(options, vcs):
if vcs == 'svn':
logging.info("Performing a " + output.green("svn status -u") + \
" with a little magic grep to check for updates.")
- retval = getstatusoutput("svn status -u 2>&1 | " + \
+ retval =
commands.
getstatusoutput("svn status -u 2>&1 | " + \
"egrep -v '^. +.*/digest-[^/]+' | " + \
"head -n-1")