diff options
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch')
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch deleted file mode 100644 index 526a3b1fb2..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 3bb8d08bdec2f79bb13c0a44b81718d26e5bdabc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Mon, 8 May 2017 16:30:20 +0800 | ||
| 4 | Subject: [PATCH 04/11] fix new.roots object is not iterable | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 9 | --- | ||
| 10 | blivet/blivet.py | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/blivet/blivet.py b/blivet/blivet.py | ||
| 14 | index ea08837..91c92b2 100644 | ||
| 15 | --- a/blivet/blivet.py | ||
| 16 | +++ b/blivet/blivet.py | ||
| 17 | @@ -1206,7 +1206,7 @@ class Blivet(object): | ||
| 18 | p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) | ||
| 19 | partition.parted_partition = p | ||
| 20 | |||
| 21 | - for root in new.roots: | ||
| 22 | + for root in new.roots or []: | ||
| 23 | root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps] | ||
| 24 | root.swaps = [s for s in root.swaps if s] | ||
| 25 | |||
| 26 | -- | ||
| 27 | 2.7.4 | ||
| 28 | |||
