From: Mark Hatle Date: Thu, 15 Sep 2016 22:47:38 +0000 (-0500) Subject: package_manager.py: Adjust error message order X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~24159 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d643fb2a9cb5bd0d8b0105e9d44b989a49ffa963;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Mark Hatle Signed-off-by: Ross Burton --- diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 30e1de99b9d..238dddca79e 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: