commit:     753d18b58afd38cb282b405e75406e20dd9c14be
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 05:38:28 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 05:38:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=753d18b5

base/stagebase.py: Fix 48856f7e10e due to a change to AutoResume.get()

Changing the formatting to match in the log messages broke the hash matching 
preventing
them from ever matching.

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 2557fe8..b857a64 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -744,7 +744,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
                        # check seed source
                        if os.path.isfile(self.settings["source_path"]) and not 
invalid_chroot:
-                               if self.settings["source_path_hash"] == 
clst_unpack_hash:
+                               if 
self.settings["source_path_hash"].replace("\n", " ") == clst_unpack_hash:
                                        # Seed tarball has not changed, chroot 
is valid
                                        _unpack = False
                                        invalid_chroot = False

Reply via email to