diff options
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 | |||
| 36 | finally: | 36 | finally: |
| 37 | del getTS.ts | 37 | del getTS.ts |
| 38 | cb.grabOutput(False) | 38 | cb.grabOutput(False) |
| 39 | + if probs and sysconf.has("attempt-install", soft=True): | 39 | + if (probs is not None) and sysconf.has("attempt-install", soft=True): |
| 40 | + def remove_conflict(pkgNEVR): | 40 | + def remove_conflict(pkgNEVR): |
| 41 | + for key in changeset.keys(): | 41 | + for key in changeset.keys(): |
| 42 | + if pkgNEVR == str(key): | 42 | + if pkgNEVR == str(key): |
| @@ -67,8 +67,8 @@ index 9bbd952..ba6405a 100644 | |||
| 67 | + retry = 0 | 67 | + retry = 0 |
| 68 | + | 68 | + |
| 69 | prog.setDone() | 69 | prog.setDone() |
| 70 | - if probs: | 70 | - if probs is not None: |
| 71 | + if probs and (not retry): | 71 | + if (probs is not None) and (not retry): |
| 72 | raise Error, "\n".join([x[0] for x in probs]) | 72 | raise Error, "\n".join([x[0] for x in probs]) |
| 73 | prog.stop() | 73 | prog.stop() |
| 74 | + if retry and len(changeset): | 74 | + if retry and len(changeset): |