summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-10-29 13:54:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:27:13 +0000
commit944fb2fd0268ee31be7acca4ad56681d5cbb7dfd (patch)
tree68988ac8b13d6db31ab14b6dd95ebd5a967d31d8
parentfe244b285a7624cecdf08819c21896aa6b6bb11e (diff)
downloadpoky-944fb2fd0268ee31be7acca4ad56681d5cbb7dfd.tar.gz
python-smartpm: report warn rather than error during install with --attempt
With the following config and build image: ... IMAGE_INSTALL_append = "shadow man-pages" EXTRA_IMAGE_FEATURES += "doc-pkgs" ... There is an error during install with --attempt, and it breaks the build. ... |error: file /usr/share/man/man5/passwd.5 from install of shadow-doc-4.2.1-r0.i586 conflicts with file from package man-pages-3.71-r0.i586 ... For complementary and 'attemptonly' package processing, we should make sure the warn rather than error messages reported. [YOCTO #6769] (From OE-Core rev: beb2e989e24e671fecd37805876dfb2375ee0df6) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-attempt.patch27
1 files changed, 24 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch
index 113618255f..45f794787c 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch
+++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch
@@ -1,4 +1,4 @@
1From 7ee23804a06f81476cc2b31a6db11b52d7af764e Mon Sep 17 00:00:00 2001 1From b105e7fe812da3ccaf7155c0fe14c8728b0d39a5 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com> 2From: Mark Hatle <mark.hatle@windriver.com>
3Date: Mon, 20 Jan 2014 14:30:52 +0000 3Date: Mon, 20 Jan 2014 14:30:52 +0000
4Subject: [PATCH] Add mechanism to attempt install without failing 4Subject: [PATCH] Add mechanism to attempt install without failing
@@ -13,11 +13,32 @@ Upstream-Status: Pending
13 13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 15Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
16
17For complementary and 'attemptonly' package processing, we should
18make sure the warn rather than error reported.
19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16--- 20---
21 smart.py | 5 +++-
17 smart/commands/install.py | 5 ++++ 22 smart/commands/install.py | 5 ++++
18 smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ 23 smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------
19 2 files changed, 54 insertions(+), 16 deletions(-) 24 3 files changed, 58 insertions(+), 17 deletions(-)
20 25
26diff --git a/smart.py b/smart.py
27index c5c7a02..7e7fd34 100755
28--- a/smart.py
29+++ b/smart.py
30@@ -179,7 +179,10 @@ def main(argv):
31 if opts and opts.log_level == "debug":
32 import traceback
33 traceback.print_exc()
34- if iface.object:
35+ if iface.object and sysconf.has("attempt-install", soft=True):
36+ iface.warning(unicode(e))
37+ exitcode = 0
38+ elif iface.object:
39 iface.error(unicode(e))
40 else:
41 sys.stderr.write(_("error: %s\n") % e)
21diff --git a/smart/commands/install.py b/smart/commands/install.py 42diff --git a/smart/commands/install.py b/smart/commands/install.py
22index 590222c..6ef9682 100644 43index 590222c..6ef9682 100644
23--- a/smart/commands/install.py 44--- a/smart/commands/install.py
@@ -163,5 +184,5 @@ index 5730a42..e3e61c6 100644
163 self._remove(pkg, changeset, locked, pending) 184 self._remove(pkg, changeset, locked, pending)
164 elif op is UPGRADE: 185 elif op is UPGRADE:
165-- 186--
1661.8.4.2 1871.9.1
167 188