mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 11:38:34 +00:00
d3ae34eec2
- 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>
29 lines
907 B
Diff
29 lines
907 B
Diff
From c31df1c0f5323ddc70e0d1c6d11db2fbf7a024ad Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Mon, 8 May 2017 16:30:20 +0800
|
|
Subject: [PATCH 04/11] fix new.roots object is not iterable
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
blivet/blivet.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/blivet/blivet.py b/blivet/blivet.py
|
|
index 3405810..f42b73b 100644
|
|
--- a/blivet/blivet.py
|
|
+++ b/blivet/blivet.py
|
|
@@ -1198,7 +1198,7 @@ class Blivet(object):
|
|
p = partition.disk.format.parted_disk.getPartitionByPath(partition.path)
|
|
partition.parted_partition = p
|
|
|
|
- for root in new.roots:
|
|
+ for root in new.roots or []:
|
|
root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps]
|
|
root.swaps = [s for s in root.swaps if s]
|
|
|
|
--
|
|
2.7.4
|
|
|