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 37F5413827E for ; Sat, 14 Dec 2013 04:51:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90120E0BCE; Sat, 14 Dec 2013 04:51:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7308E0BCE for ; Sat, 14 Dec 2013 04:51:37 +0000 (UTC) Received: from mail-qc0-f173.google.com (mail-qc0-f173.google.com [209.85.216.173]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id 02E0233F2DA for ; Sat, 14 Dec 2013 04:51:36 +0000 (UTC) Received: by mail-qc0-f173.google.com with SMTP id m20so2240497qcx.32 for ; Fri, 13 Dec 2013 20:51:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=HJxzew8o0U8KlRX0s2hFV923o4mr5LBzk4M/ng9E8uY=; b=Kn2gzH94qcSAMeXy2+M64CstlhhLt2ZgTyH41VT1jox8OKk8k2hEgWW6iWdMjw9Km4 7sKIMiGyy5t0dlkCMX1RRtr0BMmgeKphP/VWJd5LMcf6oK1YCfZvGDgeh1C54xauNSkM D7cu5J6LSV7eA64LC3NBaCKrBs0C+DlDDQ5oGrnUfSm2/mfbeDWoixUbk7k573VtWmkU yQrkQbog6u61Qvi3Rpr1TpqEl71UnenHbOFqVai0Ht6PXqrDS0X372I9ffxBX4++Ahg+ ee2sVdazBztILu6l9yW6715bTplnPuGEeWaquPafuwVm41xw2yh4w1CzCfKiDTB8MNWt hMTw== X-Received: by 10.49.129.38 with SMTP id nt6mr11113179qeb.78.1386996695336; Fri, 13 Dec 2013 20:51:35 -0800 (PST) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Received: by 10.229.178.129 with HTTP; Fri, 13 Dec 2013 20:51:15 -0800 (PST) In-Reply-To: <1386990436-9198-2-git-send-email-dolsen@gentoo.org> References: <1386990436-9198-1-git-send-email-dolsen@gentoo.org> <1386990436-9198-2-git-send-email-dolsen@gentoo.org> From: Matt Turner Date: Fri, 13 Dec 2013 20:51:15 -0800 Message-ID: Subject: Re: [gentoo-catalyst] [PATCH 1/4] Add more configured defaults To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Content-Type: text/plain; charset=ISO-8859-1 X-Archives-Salt: 494f1916-321f-4508-b218-5bc380190680 X-Archives-Hash: 975fffcf872496a8bddfb13e08e8a20b On Fri, Dec 13, 2013 at 7:07 PM, Brian Dolbec wrote: > Use the new configured snapshot_name and portdir settings > Use the portdir setting rather than hard-coded path > --- > catalyst | 14 +++++++++----- > modules/generic_stage_target.py | 6 ++++-- > modules/snapshot_target.py | 14 +++++++++----- > modules/tinderbox_target.py | 4 ++-- > 4 files changed, 24 insertions(+), 14 deletions(-) > > diff --git a/catalyst b/catalyst > index ba26f3c..19ec77e 100755 > --- a/catalyst > +++ b/catalyst > @@ -61,11 +61,15 @@ def parse_config(myconfig): > myconf={} > config_file="" > > - confdefaults={ "storedir":"/var/tmp/catalyst",\ > - "sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\ > - "portdir":"/usr/portage","options":"",\ > - "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\ > - "hash_function":"crc32"} > + confdefaults={ > + "hash_function": "crc32", > + "portdir": "/usr/portage", > + "repo_name": "portage", > + "sharedir": "/usr/lib/catalyst", > + "snapshot_name": "portage-", > + "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", > + "storedir": "/var/tmp/catalyst", > + } I agree that adding a key:value to store "portage-" seems unnecessary. I don't think we should do this unless someone has a compelling reason. Also, we lost "options" here. Is this intentional or consequential? > > # first, try the one passed (presumably from the cmdline) > if myconfig: > diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py > index 848aca2..c2888b6 100644 > --- a/modules/generic_stage_target.py > +++ b/modules/generic_stage_target.py > @@ -410,7 +410,8 @@ class generic_stage_target(generic_target): > > def set_snapshot_path(self): > self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\ > - "/snapshots/portage-"+self.settings["snapshot"]+".tar.xz") > + "/snapshots/" + self.settings["snapshot_name"] + > + self.settings["snapshot"]+".tar.xz") > > if os.path.exists(self.settings["snapshot_path"]): > self.settings["snapshot_path_hash"]=\ > @@ -418,7 +419,8 @@ class generic_stage_target(generic_target): > hash_function=self.settings["hash_function"],verbose=False) > else: > self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\ > - "/snapshots/portage-"+self.settings["snapshot"]+".tar.bz2") > + "/snapshots/" + self.settings["snapshot_name"] + > + self.settings["snapshot"]+".tar.bz2") > > if os.path.exists(self.settings["snapshot_path"]): > self.settings["snapshot_path_hash"]=\ > diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py > index e93a86a..29d6e87 100644 > --- a/modules/snapshot_target.py > +++ b/modules/snapshot_target.py > @@ -18,8 +18,9 @@ class snapshot_target(generic_stage_target): > self.settings=myspec > self.settings["target_subpath"]="portage" > st=self.settings["storedir"] > - self.settings["snapshot_path"]=normpath(st+"/snapshots/portage-"+self.settings["version_stamp"]\ > - +".tar.bz2") > + self.settings["snapshot_path"]=normpath(st + "/snapshots/" > + + self.settings["snapshot_name"] > + + self.settings["version_stamp"] + ".tar.bz2") > self.settings["tmp_path"]=normpath(st+"/tmp/"+self.settings["target_subpath"]) > > def setup(self): > @@ -46,11 +47,14 @@ class snapshot_target(generic_stage_target): > if not os.path.exists(mytmp): > os.makedirs(mytmp) > > - cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ --exclude .svn --filter=H_**/files/digest-* "+\ > - self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env) > + cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ " + > + "--exclude /local/ --exclude CVS/ --exclude .svn --filter=H_**/files/digest-* " + > + self.settings["portdir"] + "/ " + mytmp + "/%s/" % self.settings["repo_name"], > + "Snapshot failure",env=self.env) > > print "Compressing Portage snapshot tarball..." > - cmd("tar -I lbzip2 -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\ > + cmd("tar -I lbzip2 -cf " + self.settings["snapshot_path"] + " -C " + > + mytmp + " %s" % self.settings["repo_name"], There's no need for "%s" % ... here. Just mytmp + " " + self.settings["repo_name"]. > "Snapshot creation failure",env=self.env) > > self.gen_contents_file(self.settings["snapshot_path"]) > diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py > index 46fe082..d6d3ea3 100644 > --- a/modules/tinderbox_target.py > +++ b/modules/tinderbox_target.py > @@ -29,8 +29,8 @@ class tinderbox_target(generic_stage_target): > raise CatalystError,"Tinderbox aborting due to error." > > def set_cleanables(self): > - self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",\ > - "/usr/portage"] > + self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*", > + self.settings['portdir']] > > def set_action_sequence(self): > #Default action sequence for run method > -- > 1.8.3.2 > >