summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-08-01 16:27:43 +0800
committerKhem Raj <raj.khem@gmail.com>2018-08-02 11:23:03 -0700
commitd3ae34eec2d312410da6cc1dd1c6fb85e8259261 (patch)
tree3f827986a0f5c4865d33b05001b2c59601208b76 /meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
parent78de74100807303fe304ea0f088317d2aa0be917 (diff)
downloadmeta-openembedded-d3ae34eec2d312410da6cc1dd1c6fb85e8259261.tar.gz
python3-blivet: 2.2.0 -> 3.0.1
- Drop 0004-Mount-var-volatile-during-install.patch and 0005-update-fstab-by-appending.patch which are moved to python3-anaconda 28.22.11 - Drop 0013-Revert-Adapt-to-logging-module-name-change.patch whichis obsolete Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch')
-rw-r--r--meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
deleted file mode 100644
index f5ff754d8d..0000000000
--- a/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From cd92eea8fab37ba6b0c7f03daa5255343dc75716 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 8 May 2017 16:30:20 +0800
4Subject: [PATCH 06/13] fix new.roots object is not iterable
5
6Upstream-Status: Pending
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 blivet/blivet.py | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/blivet/blivet.py b/blivet/blivet.py
14index 6a33e9c..79ae91a 100644
15--- a/blivet/blivet.py
16+++ b/blivet/blivet.py
17@@ -1761,7 +1761,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--
272.7.4
28