From b507e59e0d38c454bf7a76d4bd7b3ffc7b907eeb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 31 Jul 2007 08:14:50 +0000 Subject: [PATCH] Add fixes from trunk to 1.8 branch --- lib/bb/fetch/__init__.py | 4 ++-- lib/bb/fetch/svn.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index cc46b81..38527cd 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 fdba725..d2fef1d 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(): -- 2.7.4