sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

package_manager.py: Adjust error message order 

Move the debug before the error (as it can take many pages.)  This makes it
much easier for the user to see the actual error message as it is still on
the screen.

(From OE-Core rev: d643fb2a9cb5bd0d8b0105e9d44b989a49ffa963)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2016-09-15 17:47:38 -05:00 committed by Richard Purdie
parent 1a8e50e153
commit f1e3dc029f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/lib/oe/package_manager.py
View File

@ -839,10 +839,10 @@ class RpmPM(PackageManager):
new_pkg = self._search_pkg_name_in_feeds(subst, feed_archs)
if not new_pkg:
# Failed to translate, package not found!
err_msg = '%s not found in the %s feeds (%s).\n' % \
err_msg = '%s not found in the %s feeds (%s).' % \
(pkg, mlib, " ".join(feed_archs))
if not attempt_only:
err_msg += " ".join(self.fullpkglist)
bb.error("List of available packages: " + " ".join(self.fullpkglist))
bb.fatal(err_msg)
bb.warn(err_msg)
else:
@ -856,10 +856,10 @@ class RpmPM(PackageManager):
default_archs = self.ml_prefix_list['default']
new_pkg = self._search_pkg_name_in_feeds(pkg, default_archs)
if not new_pkg:
err_msg = '%s not found in the base feeds (%s).\n' % \
err_msg = '%s not found in the feeds (%s).' % \
(pkg, ' '.join(default_archs))
if not attempt_only:
err_msg += " ".join(self.fullpkglist)
bb.error("List of available packages: " + " ".join(self.fullpkglist))
bb.fatal(err_msg)
bb.warn(err_msg)
else: