diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-13 17:01:50 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-15 10:05:29 +0000 |
| commit | 6bbdc7d259c0cc041b62dbdb26cfc3ec6edcb6f3 (patch) | |
| tree | 8e8ba94ce8903d6d4586cdadd1537b7e134742d7 | |
| parent | b9746b7e4d7aa5c34eba15a61427bfc6949af123 (diff) | |
| download | bitbake-6bbdc7d259c0cc041b62dbdb26cfc3ec6edcb6f3.tar.gz | |
bitbake/fetch2: reduce output for fetch failures
Make the warning for the initial fetch failure a single line - we don't
need the full command and output here yet, but write it into the log in
full as a debug message. However, if fetching from mirrors fails as well
then print out the full details for the first error that occurred as an
ERROR rather than a WARNING.
Since this is logged as an ERROR, combined with an earlier patch it
suppresses the full log which does make the output much more readable
for any fetch error.
Fixes [YOCTO #1832].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 771f72e4a..fe4f4b1d6 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -965,6 +965,7 @@ class Fetch(object): if premirroronly: self.d.setVar("BB_NO_NETWORK", "1") + firsterr = None if not localpath and m.need_update(u, ud, self.d): try: logger.debug(1, "Trying Upstream") @@ -980,7 +981,9 @@ class Fetch(object): raise except BBFetchException as e: - logger.warn(str(e)) + logger.warn('Failed to fetch URL %s' % u) + logger.debug(1, str(e)) + firsterr = e # Remove any incomplete fetch if os.path.isfile(ud.localpath): bb.utils.remove(ud.localpath) @@ -989,6 +992,8 @@ class Fetch(object): localpath = try_mirrors (self.d, ud, mirrors) if not localpath or ((not os.path.exists(localpath)) and localpath.find("*") == -1): + if firsterr: + logger.error(str(firsterr)) raise FetchError("Unable to fetch URL from any source.", u) update_stamp(u, ud, self.d) |