summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-01-02 15:14:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:16 +0000
commit372bcd3c978524fa2ca31e4fe14f288f67562cdb (patch)
tree81a8bbbf8bf754f9891e81ccfdc80ea5e1ec32ac /meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch
parentb70f96a17fc13a74c04fd56e34cdc8f84dbf2f69 (diff)
downloadpoky-372bcd3c978524fa2ca31e4fe14f288f67562cdb.tar.gz
python-smartpm: remove the recipe
(From OE-Core rev: 9ff0e8b4012f1e68f6caebc3027f9d1bada00f13) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch b/meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch
deleted file mode 100644
index bb8c3afdb7..0000000000
--- a/meta/recipes-devtools/python/python-smartpm/smart-rpm-transaction-failure-check.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 0c55d7e18f40465e95e8e4bf22af01f5d4477d3c Mon Sep 17 00:00:00 2001
2From: Daniel Klauer <daniel.klauer@gin.de>
3Date: Wed, 11 May 2016 17:22:49 +0200
4Subject: [PATCH] rpm: Don't ignore transaction error with empty problems list
5
6SmartPM could misinterpret RPM transaction error as success,
7if ts.run() (RPM Python API) returns an empty problems list,
8because of incorrect check for None which treated empty list
9to be the same as None when it has different meaning.
10
11ts.run() returns:
12* None in case of success
13* problems list in case of error, may be empty
14(look at rpmts_Run() in rpm-5.4.14/python/rpmts-py.c [1])
15
16"if mylist" is not good enough to check for error here, because it will
17treat an empty list as "false" because its len() == 0 [2].
18
19ts.check() seems to be different (it's ok for it to return an empty list),
20but for consistency it should be made clear that it can return either None,
21an empty list or a non-empty list.
22
23[1] http://rpm5.org/cvs/fileview?f=rpm/python/rpmts-py.c&v=1.111.2.3
24[2] https://docs.python.org/2/library/stdtypes.html#truth-value-testing
25
26Upstream-Status: Pending
27
28Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
29---
30 smart/backends/rpm/pm.py | 4 ++--
31 1 file changed, 2 insertions(+), 2 deletions(-)
32
33diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py
34index 9bbd952..635f726 100644
35--- a/smart/backends/rpm/pm.py
36+++ b/smart/backends/rpm/pm.py
37@@ -208,7 +208,7 @@ class RPMPackageManager(PackageManager):
38 force = sysconf.get("rpm-force", False)
39 if not force:
40 probs = ts.check()
41- if probs:
42+ if (probs is not None) and (len(probs) != 0):
43 problines = []
44 for prob in probs:
45 name1 = "%s-%s-%s" % prob[0]
46@@ -247,7 +247,7 @@ class RPMPackageManager(PackageManager):
47 del getTS.ts
48 cb.grabOutput(False)
49 prog.setDone()
50- if probs:
51+ if probs is not None:
52 raise Error, "\n".join([x[0] for x in probs])
53 prog.stop()
54
55--
561.9.1
57