summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-06-08 11:13:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:10 +0100
commite5a11759d8d6f15191167ab1f3ffb3db8b6715aa (patch)
tree44fe024503658a86ad6ee2b80af938fb1c10a72d /meta/recipes-devtools
parent0090170e77baa2a2e9888f5d4b076ddca879d06b (diff)
downloadpoky-e5a11759d8d6f15191167ab1f3ffb3db8b6715aa.tar.gz
python-smartpm: change "already installed" warnings into info messages
It's possible to trigger "already installed" messages during normal usage if you explicitly install something in the image through IMAGE_INSTALL that has a dependency on some -dev packages and also have dev-pkgs in IMAGE_FEATURES. Since we now check the do_rootfs log for warnings, these are reported as warnings at the build system level. This situation should not trigger warnings, nor is it really cause for concern under any other circumstance if the user asks smart to install something that's already installed, so make it an info message rather than a warning. Fixes [YOCTO #7840]. (From OE-Core rev: ac782fe535855ed87f87c2c9e1e584bf0181378a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch54
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb1
2 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch b/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch
new file mode 100644
index 0000000000..9055555cd0
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-already-installed-message.patch
@@ -0,0 +1,54 @@
1From a74a9a9eb9d75964a0e978950e8b191d7a18d763 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Fri, 5 Jun 2015 17:07:16 +0100
4Subject: [PATCH] smart: change "is already installed" message from warning to
5 info
6
7This doesn't need to be a warning.
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12---
13 smart/commands/install.py | 4 ++--
14 smart/interfaces/text/interactive.py | 2 +-
15 2 files changed, 3 insertions(+), 3 deletions(-)
16
17diff --git a/smart/commands/install.py b/smart/commands/install.py
18index 6ef9682..80d456b 100644
19--- a/smart/commands/install.py
20+++ b/smart/commands/install.py
21@@ -152,7 +152,7 @@ def main(ctrl, opts):
22 for obj in results:
23 for pkg in obj.packages:
24 if pkg.installed:
25- iface.warning(_("%s (for %s) is already installed")
26+ iface.info(_("%s (for %s) is already installed")
27 % (pkg, arg))
28 installed = True
29 break
30@@ -184,7 +184,7 @@ def main(ctrl, opts):
31 for name in names:
32 pkg = names[name][0]
33 if pkg.installed:
34- iface.warning(_("%s is already installed") % pkg)
35+ iface.info(_("%s is already installed") % pkg)
36 else:
37 trans.enqueue(pkg, INSTALL)
38
39diff --git a/smart/interfaces/text/interactive.py b/smart/interfaces/text/interactive.py
40index 9865584..190867b 100644
41--- a/smart/interfaces/text/interactive.py
42+++ b/smart/interfaces/text/interactive.py
43@@ -278,7 +278,7 @@ class Interpreter(Cmd):
44 for name in names:
45 pkg = names[name][0]
46 if pkg.installed:
47- iface.warning(_("%s is already installed") % pkg)
48+ iface.info(_("%s is already installed") % pkg)
49 else:
50 found = True
51 transaction.enqueue(pkg, INSTALL)
52--
532.1.0
54
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index c75f10fbf3..69b94a2134 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -34,6 +34,7 @@ SRC_URI = "\
34 file://smart-filename-NAME_MAX.patch \ 34 file://smart-filename-NAME_MAX.patch \
35 file://smart-rpm4-fixes.patch \ 35 file://smart-rpm4-fixes.patch \
36 file://smart-add-for-rpm-ignoresize-check.patch \ 36 file://smart-add-for-rpm-ignoresize-check.patch \
37 file://smart-already-installed-message.patch \
37 " 38 "
38 39
39SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 40SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"