summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2007-07-31 08:14:50 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2007-07-31 08:14:50 +0000
commitb507e59e0d38c454bf7a76d4bd7b3ffc7b907eeb (patch)
tree7f9b250bff8827a9f3ed9f1f73ac99938b767ff2
parent0e2babba6143687d9b28909fc308ca68fc5c0b95 (diff)
downloadbitbake-b507e59e0d38c454bf7a76d4bd7b3ffc7b907eeb.tar.gz
Add fixes from trunk to 1.8 branch
-rw-r--r--lib/bb/fetch/__init__.py4
-rw-r--r--lib/bb/fetch/svn.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py
index cc46b81d6..38527cdda 100644
--- a/lib/bb/fetch/__init__.py
+++ b/lib/bb/fetch/__init__.py
@@ -235,9 +235,9 @@ def runfetchcmd(cmd, d, quiet = False):
exitstatus = status & 0xff
if signal:
- raise FetchError("Fetch command %s failed with signal %s, output:\n%s" % pathcmd, signal, output)
+ raise FetchError("Fetch command %s failed with signal %s, output:\n%s" % (pathcmd, signal, output))
elif status != 0:
- raise FetchError("Fetch command %s failed with exit code %s, output:\n%s" % pathcmd, status, output)
+ raise FetchError("Fetch command %s failed with exit code %s, output:\n%s" % (pathcmd, status, output))
return output
diff --git a/lib/bb/fetch/svn.py b/lib/bb/fetch/svn.py
index fdba72517..d2fef1d4e 100644
--- a/lib/bb/fetch/svn.py
+++ b/lib/bb/fetch/svn.py
@@ -177,7 +177,7 @@ class Svn(Fetch):
"""
bb.msg.debug(2, bb.msg.domain.Fetcher, "SVN fetcher hitting network for %s" % url)
- output = runfetchcmd("LANG= LC_ALL= " + self._buildsvncommand(ud, d, "info"), d, True)
+ output = runfetchcmd("LANG=C LC_ALL=C " + self._buildsvncommand(ud, d, "info"), d, True)
revision = None
for line in output.splitlines():