From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28A40139694 for ; Thu, 9 Mar 2017 05:38:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6A41E0C2D; Thu, 9 Mar 2017 05:38:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1BDAE0C2D for ; Thu, 9 Mar 2017 05:38:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66D1634169D for ; Thu, 9 Mar 2017 05:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0971A61D7 for ; Thu, 9 Mar 2017 05:38:46 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1489037908.753d18b58afd38cb282b405e75406e20dd9c14be.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 753d18b58afd38cb282b405e75406e20dd9c14be X-VCS-Branch: master Date: Thu, 9 Mar 2017 05:38:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b8410b12-1be0-4fcd-8bb9-c508ba6fa0a1 X-Archives-Hash: ce3784af7b5ea41ed6e5333e1167d1ed commit: 753d18b58afd38cb282b405e75406e20dd9c14be Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 05:38:28 2017 +0000 Commit: Brian Dolbec gentoo 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