| 1 |
commit: 753d18b58afd38cb282b405e75406e20dd9c14be |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 9 05:38:28 2017 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 9 05:38:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=753d18b5 |
| 7 |
|
| 8 |
base/stagebase.py: Fix 48856f7e10e due to a change to AutoResume.get() |
| 9 |
|
| 10 |
Changing the formatting to match in the log messages broke the hash matching preventing |
| 11 |
them from ever matching. |
| 12 |
|
| 13 |
catalyst/base/stagebase.py | 2 +- |
| 14 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 17 |
index 2557fe8..b857a64 100644 |
| 18 |
--- a/catalyst/base/stagebase.py |
| 19 |
+++ b/catalyst/base/stagebase.py |
| 20 |
@@ -744,7 +744,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 21 |
|
| 22 |
# check seed source |
| 23 |
if os.path.isfile(self.settings["source_path"]) and not invalid_chroot: |
| 24 |
- if self.settings["source_path_hash"] == clst_unpack_hash: |
| 25 |
+ if self.settings["source_path_hash"].replace("\n", " ") == clst_unpack_hash: |
| 26 |
# Seed tarball has not changed, chroot is valid |
| 27 |
_unpack = False |
| 28 |
invalid_chroot = False |
Archives