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 CC08E138247 for ; Sun, 15 Dec 2013 04:01:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4853E0B25; Sun, 15 Dec 2013 04:00:57 +0000 (UTC) Received: from qmta14.westchester.pa.mail.comcast.net (qmta14.westchester.pa.mail.comcast.net [76.96.59.212]) by pigeon.gentoo.org (Postfix) with ESMTP id 24F7BE0B1A for ; Sun, 15 Dec 2013 04:00:57 +0000 (UTC) Received: from omta12.westchester.pa.mail.comcast.net ([76.96.62.44]) by qmta14.westchester.pa.mail.comcast.net with comcast id 1g0M1n0020xGWP85Eg0w71; Sun, 15 Dec 2013 04:00:56 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta12.westchester.pa.mail.comcast.net with comcast id 1g0v1n00q152l3L3Yg0wcr; Sun, 15 Dec 2013 04:00:56 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 26616D69959; Sat, 14 Dec 2013 20:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387080055; bh=AVdjgwtYwOTrZ6HiomGh6ZfTbBJWkJ+ZuE8wnPbdrcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=pC3eYViRAMW6QIm4w0PHa8Oy9zyJnLaP+tSkPtC06DwGw2QPqhbIwew83hztmPsMN jiZypJYOSy2xvgiuVeLjKXoydXwpTjNeGUqAM8gN5PGM70DLEUkfAP4/vYp4Pcf+ZL uP6TWDJFXwr2ec3IhC6Hhqy1MiydKdSF6TUgmwN0= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v3 07/19] catalyst: Add 'repo_name' default Date: Sat, 14 Dec 2013 20:00:33 -0800 Message-Id: X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: <20131215032258.GK25409@odin.tremily.us> In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387080056; bh=+YWCmZYy50HUeiKHCH/Zv+pBiZr6anTxnrvybBLEO68=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=h2tWmLHcvd85hCrlF+kWYPM8CbOyBmx2pMs0Tn4L//roM5VLvjvk+8CTtqz9ZGSz1 UTAqXAgalGrrALSDBn+OZXLnmvLvuYtB0Npz2xuHzeW824Q5Vx6nuD7S70bVQwCn+n AZLEnACVBZUiHVaRiLWbYyX8UQyyEcEgXeYDu4juo1dgXiv9ruSLd/54VdQND4YcdV 3BYEm+28etGmideU9r/etRj2ztgpjmMPs5X/GN9ihUEtCHfcLLJlIIOTxLl0/k4OEb agg/r5WOUlK1yo9raoZDekk7qvFdJLw4btV9qOStaai1hFfKjG4ABV/BObI/UfbKV+ iuUipF/mG2yKw== 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 X-Archives-Salt: c69611b6-4237-47dc-acd8-bc11e82935af X-Archives-Hash: 13af93bde5027b074e92663184e6cd49 From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King Signed-off-by: Brian Dolbec --- catalyst | 1 + modules/snapshot_target.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/catalyst b/catalyst index e229133..0fc65b0 100755 --- a/catalyst +++ b/catalyst @@ -66,6 +66,7 @@ def parse_config(myconfig): "hash_function": "crc32", "options": "", "portdir": "/usr/portage", + "repo_name": "portage", "sharedir": "/usr/share/catalyst", "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", "storedir": "/var/tmp/catalyst", diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py index e93a86a..02b9831 100644 --- a/modules/snapshot_target.py +++ b/modules/snapshot_target.py @@ -46,11 +46,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 + " " + self.settings["repo_name"], "Snapshot creation failure",env=self.env) self.gen_contents_file(self.settings["snapshot_path"]) -- 1.8.3.2