summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-09-15 17:47:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 15:11:08 +0100
commitf1e3dc029f0be096cb272846ef0ded1a485308e5 (patch)
tree474cc504627f22b3c36452c826004960a9b690bf /meta/lib
parent1a8e50e153d94f9d4b76199e3bcf56220f0a419f (diff)
downloadpoky-f1e3dc029f0be096cb272846ef0ded1a485308e5.tar.gz
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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py8
1 files changed, 4 insertions, 4 deletions
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):
839 new_pkg = self._search_pkg_name_in_feeds(subst, feed_archs) 839 new_pkg = self._search_pkg_name_in_feeds(subst, feed_archs)
840 if not new_pkg: 840 if not new_pkg:
841 # Failed to translate, package not found! 841 # Failed to translate, package not found!
842 err_msg = '%s not found in the %s feeds (%s).\n' % \ 842 err_msg = '%s not found in the %s feeds (%s).' % \
843 (pkg, mlib, " ".join(feed_archs)) 843 (pkg, mlib, " ".join(feed_archs))
844 if not attempt_only: 844 if not attempt_only:
845 err_msg += " ".join(self.fullpkglist) 845 bb.error("List of available packages: " + " ".join(self.fullpkglist))
846 bb.fatal(err_msg) 846 bb.fatal(err_msg)
847 bb.warn(err_msg) 847 bb.warn(err_msg)
848 else: 848 else:
@@ -856,10 +856,10 @@ class RpmPM(PackageManager):
856 default_archs = self.ml_prefix_list['default'] 856 default_archs = self.ml_prefix_list['default']
857 new_pkg = self._search_pkg_name_in_feeds(pkg, default_archs) 857 new_pkg = self._search_pkg_name_in_feeds(pkg, default_archs)
858 if not new_pkg: 858 if not new_pkg:
859 err_msg = '%s not found in the base feeds (%s).\n' % \ 859 err_msg = '%s not found in the feeds (%s).' % \
860 (pkg, ' '.join(default_archs)) 860 (pkg, ' '.join(default_archs))
861 if not attempt_only: 861 if not attempt_only:
862 err_msg += " ".join(self.fullpkglist) 862 bb.error("List of available packages: " + " ".join(self.fullpkglist))
863 bb.fatal(err_msg) 863 bb.fatal(err_msg)
864 bb.warn(err_msg) 864 bb.warn(err_msg)
865 else: 865 else: