From f1e3dc029f0be096cb272846ef0ded1a485308e5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 15 Sep 2016 17:47:38 -0500 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/lib/oe/package_manager.py') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 30e1de99b9..238dddca79 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -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: -- cgit v1.2.3-54-g00ecf