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 7EE15138247 for ; Sat, 14 Dec 2013 22:25:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A0DAE0B23; Sat, 14 Dec 2013 22:24:48 +0000 (UTC) Received: from qmta01.westchester.pa.mail.comcast.net (qmta01.westchester.pa.mail.comcast.net [76.96.62.16]) by pigeon.gentoo.org (Postfix) with ESMTP id 6BBC8E0B16 for ; Sat, 14 Dec 2013 22:24:46 +0000 (UTC) Received: from omta09.westchester.pa.mail.comcast.net ([76.96.62.20]) by qmta01.westchester.pa.mail.comcast.net with comcast id 1aKf1n0090SCNGk51aQlQT; Sat, 14 Dec 2013 22:24:45 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta09.westchester.pa.mail.comcast.net with comcast id 1aQk1n00g152l3L3VaQlSF; Sat, 14 Dec 2013 22:24:45 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 1A4E7D68B39; Sat, 14 Dec 2013 14:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387059884; bh=1uN1he474D4o2Hv/fvnbR/6yNMZf8qmVdZvXSRvniLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=KlrHVvXuQlgM1iaWMNK9w9IjN/sj2VhxWfp5yAMuibWhs7A4Z+mDUIAC6i3qY+ue7 sIOizzd3Y8K8EmUnnH5Q/L6hTGjWq4UxtMp/BG/Ee8O9IfkOlv7XCBJVKqy/tztS+j /h6+cMjuSqyKgjdWgg+aGbpD8fWdTHrbXHLelVPI= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v2 07/21] catalyst: Add 'repo_name' default Date: Sat, 14 Dec 2013 14:24:15 -0800 Message-Id: <47d3d14902039e82f66ff831a548ed9bf9aeb76c.1387059467.git.wking@tremily.us> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387059885; bh=O51XQvCoN0e0lX9yIteFjJBhctHO9+W5b9sngyXuHaA=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=ssp++syeArWYgharxd214Xs2iNltosXJ8DqGfENTjtPKWe52wePD1QslLYUQPIuIw XDTTIEwD0i32pYWf2QDOMu7bBAv37kZskMXcGRz/Kw1uAA51dQhfrj3dVHzP7iXEC8 al0aLDC7r+FuqoCjocIncQ2nvtsC/ve0aiZtS/s2jU7bXAozeKSIwAnENHh5jQ16L5 qIHDUJ9OpqfURdN/A+9RRpjS1ibBR+zesBAP2rlr2yLmPhb+ebKv9ZAA5FfiRxm1OW +k5qCHw7wFWCMBWwxi9kbFPWJMQTgeCGe0z8Od6cZ8lYqe9IMphFvZfYKVhDJH/wY7 O0Nqu/8DHHSCw== 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: 9661fb99-c82d-4604-9726-ba36b0c6a8b6 X-Archives-Hash: 00deb69a94c5c1d7b246c59be9046087 From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King --- 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