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 CDD501384B4 for ; Sat, 21 Nov 2015 01:33:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8310F21C00F; Sat, 21 Nov 2015 01:33:50 +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 7118921C008 for ; Sat, 21 Nov 2015 01:33:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABF58340A75 for ; Sat, 21 Nov 2015 01:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAC661068 for ; Sat, 21 Nov 2015 01:33:44 +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: <1446050996.06fd1a0cd1a957c14343d9c0440dd606a883ee12.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending 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: 06fd1a0cd1a957c14343d9c0440dd606a883ee12 X-VCS-Branch: pending Date: Sat, 21 Nov 2015 01:33:44 +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: 7d23f6be-9361-488f-844e-0f7ce44b46bf X-Archives-Hash: 66eec98dc90d79ae1bea7fbbfa25623b commit: 06fd1a0cd1a957c14343d9c0440dd606a883ee12 Author: Mike Frysinger gentoo org> AuthorDate: Sun Oct 11 18:23:26 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Oct 28 16:49:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=06fd1a0c stagebase: robustify portage_confdir setup When setting up the portage_confdir, we should make sure it exists, and that we rsync it properly (regardless of the settings given by the user). Bugzilla: https://bugs.gentoo.org/538652 Reported-by: Joshua Kinard gentoo.org> catalyst/base/stagebase.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 3c24dbd..6094109 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -893,8 +893,12 @@ class StageBase(TargetBase, ClearBase, GenBase): else: if "portage_confdir" in self.settings: log.info('Configuring %s...', self.settings['port_conf']) - cmd("rsync -a " + self.settings["portage_confdir"] + "/ " + - self.settings["chroot_path"] + self.settings["port_conf"], + dest = normpath(self.settings['chroot_path'] + '/' + self.settings['port_conf']) + ensure_dirs(dest) + # The trailing slashes on both paths are important: + # We want to make sure rsync copies the dirs into each + # other and not as subdirs. + cmd('rsync -a %s/ %s/' % (self.settings['portage_confdir'], dest), "Error copying %s" % self.settings["port_conf"], env=self.env) self.resume.enable("setup_confdir")