diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-10-29 13:54:50 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:27:13 +0000 |
| commit | 944fb2fd0268ee31be7acca4ad56681d5cbb7dfd (patch) | |
| tree | 68988ac8b13d6db31ab14b6dd95ebd5a967d31d8 /meta/recipes-devtools/python/python-smartpm | |
| parent | fe244b285a7624cecdf08819c21896aa6b6bb11e (diff) | |
| download | ast2050-yocto-poky-944fb2fd0268ee31be7acca4ad56681d5cbb7dfd.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-attempt.patch | 27 |
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 1136182..45f7947 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 @@ -From 7ee23804a06f81476cc2b31a6db11b52d7af764e Mon Sep 17 00:00:00 2001 +From b105e7fe812da3ccaf7155c0fe14c8728b0d39a5 Mon Sep 17 00:00:00 2001 From: Mark Hatle <mark.hatle@windriver.com> Date: Mon, 20 Jan 2014 14:30:52 +0000 Subject: [PATCH] Add mechanism to attempt install without failing @@ -13,11 +13,32 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +For complementary and 'attemptonly' package processing, we should +make sure the warn rather than error reported. +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- + smart.py | 5 +++- smart/commands/install.py | 5 ++++ smart/transaction.py | 65 +++++++++++++++++++++++++++++++++++------------ - 2 files changed, 54 insertions(+), 16 deletions(-) + 3 files changed, 58 insertions(+), 17 deletions(-) +diff --git a/smart.py b/smart.py +index c5c7a02..7e7fd34 100755 +--- a/smart.py ++++ b/smart.py +@@ -179,7 +179,10 @@ def main(argv): + if opts and opts.log_level == "debug": + import traceback + traceback.print_exc() +- if iface.object: ++ if iface.object and sysconf.has("attempt-install", soft=True): ++ iface.warning(unicode(e)) ++ exitcode = 0 ++ elif iface.object: + iface.error(unicode(e)) + else: + sys.stderr.write(_("error: %s\n") % e) diff --git a/smart/commands/install.py b/smart/commands/install.py index 590222c..6ef9682 100644 --- a/smart/commands/install.py @@ -163,5 +184,5 @@ index 5730a42..e3e61c6 100644 self._remove(pkg, changeset, locked, pending) elif op is UPGRADE: -- -1.8.4.2 +1.9.1 |
