diff options
| author | Klauer, Daniel <Daniel.Klauer@gin.de> | 2016-05-17 12:58:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-19 08:39:25 +0100 |
| commit | 1dc5f5d5c844585eec114be9480e0e4d8e60d09c (patch) | |
| tree | a46ab94178e61f8e191214a8210db9d48651ad0b /meta/recipes-devtools/python/python-smartpm/smart-attempt.patch | |
| parent | ba2adda60dd34b6a8feba413e3207dd8e4580294 (diff) | |
| download | openembedded-core-1dc5f5d5c844585eec114be9480e0e4d8e60d09c.tar.gz openembedded-core-1dc5f5d5c844585eec114be9480e0e4d8e60d09c.tar.bz2 openembedded-core-1dc5f5d5c844585eec114be9480e0e4d8e60d09c.zip | |
python-smartpm: Don't ignore error if RPM transaction fails without problems
SmartPM could misinterpret RPM transaction error as success,
if ts.run() (RPM Python API) returns an empty problems list.
This could happen for example if the RPM database is partially corrupted
such that the transaction does not have any problems like conflicts or
missing dependencies, but still can't be committed.
The added patch fixes the problem in the upstream sources;
one of the existing patches has to be adjusted to still apply.
Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smart-attempt.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-attempt.patch | 6 |
1 files changed, 3 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 ec98e03c0a..5aedc88266 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -36,7 +36,7 @@ index 9bbd952..ba6405a 100644 finally: del getTS.ts cb.grabOutput(False) -+ if probs and sysconf.has("attempt-install", soft=True): ++ if (probs is not None) and sysconf.has("attempt-install", soft=True): + def remove_conflict(pkgNEVR): + for key in changeset.keys(): + if pkgNEVR == str(key): @@ -67,8 +67,8 @@ index 9bbd952..ba6405a 100644 + retry = 0 + prog.setDone() -- if probs: -+ if probs and (not retry): +- if probs is not None: ++ if (probs is not None) and (not retry): raise Error, "\n".join([x[0] for x in probs]) prog.stop() + if retry and len(changeset): |