From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0EAC2138A1F for ; Fri, 18 Apr 2014 15:53:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3AF1E09F4; Fri, 18 Apr 2014 15:53:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9310CE09F4 for ; Fri, 18 Apr 2014 15:53:39 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1DF03401A6 for ; Fri, 18 Apr 2014 15:53:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6C63D18167 for ; Fri, 18 Apr 2014 15:53:37 +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: <1397836389.237fb76b6148dcd4c5a4bf4c365633ce9c90bd0f.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 237fb76b6148dcd4c5a4bf4c365633ce9c90bd0f X-VCS-Branch: 3.0 Date: Fri, 18 Apr 2014 15:53:37 +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: 8c135911-43af-4cf9-a326-885fb67a5617 X-Archives-Hash: 14630ffd8196a4a0e73fc7750c55050d commit: 237fb76b6148dcd4c5a4bf4c365633ce9c90bd0f Author: Brian Dolbec gentoo org> AuthorDate: Fri Apr 18 15:53:09 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Apr 18 15:53:09 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=237fb76b stagebase: Fix rsync from copying stage2 inside stage3 Fixes the resolv.conf issue due to /etc not existing. Fix supplied by GMsoft. --- catalyst/base/stagebase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 395582f..52cf04e 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -402,8 +402,8 @@ class StageBase(TargetBase, ClearBase, GenBase): if "seedcache" in self.settings["options"]\ and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+\ self.settings["source_subpath"]+"/")): - self.settings["source_path"]=normpath(self.settings["storedir"]+\ - "/tmp/"+self.settings["source_subpath"]) + self.settings["source_path"] = normpath(self.settings["storedir"] + + "/tmp/" + self.settings["source_subpath"] + "/") else: self.settings["source_path"]=normpath(self.settings["storedir"]+\ "/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")