From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-catalyst+bounces-3387-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 7421813888F
	for <garchives@archives.gentoo.org>; Wed, 28 Oct 2015 14:32:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 3FB78E07B3;
	Wed, 28 Oct 2015 14:32:46 +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 C6AFBE07B3
	for <gentoo-catalyst@lists.gentoo.org>; Wed, 28 Oct 2015 14:32:45 +0000 (UTC)
Received: from professor-x (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	(Authenticated sender: dolsen)
	by smtp.gentoo.org (Postfix) with ESMTPSA id C99B7340BD2
	for <gentoo-catalyst@lists.gentoo.org>; Wed, 28 Oct 2015 14:32:43 +0000 (UTC)
Date: Wed, 28 Oct 2015 07:31:54 -0700
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH] stagebase: robustify portage_confdir
 setup
Message-ID: <20151028073154.7640680a.dolsen@gentoo.org>
In-Reply-To: <1444588136-22352-1-git-send-email-vapier@gentoo.org>
References: <1444588136-22352-1-git-send-email-vapier@gentoo.org>
Organization: Gentoo
Precedence: bulk
List-Post: <mailto:gentoo-catalyst@lists.gentoo.org>
List-Help: <mailto:gentoo-catalyst+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-catalyst+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-catalyst+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-catalyst.gentoo.org>
X-BeenThere: gentoo-catalyst@lists.gentoo.org
Reply-to: gentoo-catalyst@lists.gentoo.org
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Archives-Salt: f1f94d5a-8e0a-48a8-bb96-68a7aa58b253
X-Archives-Hash: b7f91f566c2509ad3e1b2dbcd9a51b43

On Sun, 11 Oct 2015 14:28:56 -0400
Mike Frysinger <vapier@gentoo.org> wrote:

> 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 <kumba@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 4a0b482..740e05d 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")

Yeah, this is definitely better

-- 
Brian Dolbec <dolsen>