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 6DF4A1387B1 for ; Sun, 15 Dec 2013 04:01:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AE2AE0B2D; Sun, 15 Dec 2013 04:00:58 +0000 (UTC) Received: from qmta03.westchester.pa.mail.comcast.net (qmta03.westchester.pa.mail.comcast.net [76.96.62.32]) by pigeon.gentoo.org (Postfix) with ESMTP id 910C8E0B23 for ; Sun, 15 Dec 2013 04:00:57 +0000 (UTC) Received: from omta20.westchester.pa.mail.comcast.net ([76.96.62.71]) by qmta03.westchester.pa.mail.comcast.net with comcast id 1fzl1n0011YDfWL53g0xBy; Sun, 15 Dec 2013 04:00:57 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta20.westchester.pa.mail.comcast.net with comcast id 1g0w1n00G152l3L3gg0wf4; Sun, 15 Dec 2013 04:00:57 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 5B5A0D6995F; 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=dmHqFL0NftQvuDb+H8R0fsB7yUXLGqwjVQmklQ1+3FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=GQ9WPvtyYiIxO6wWcg3f3FzFJNc307EpknsEenQPutz3UqWZmqOtuK6ugF/FmxOq3 Z/lX4a4dM1WLtd5JvPrDqebiK3PCIdZ+x/8SmKuy/Ozu9JLXF1lNkO10w1NYUZxBnn Ffvqy3dOeVP65UmbA9RTDVA/wC7j8ebpf5LSCCzA= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v3 08/19] catalyst: Add 'snapshot_name' default Date: Sat, 14 Dec 2013 20:00:34 -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=1387080057; bh=xhGBDBLaIE9R0c68xxrWIOyAZPeF6sm/Sc0ltdjPj6Y=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=Y4DIKQkjbpArTJicTN7AtOG23wgAoonWh848nA3KMXAg/obgku0iOASl2G/0pDsAI W0aFfultId2SrgT7cWXuabo5F19SzzaS+9NOcV5jrtDZR6vvv2htbCqA9jabd+QZ7T 5JU5oE9WM2ZtBeCYJsCh6PXp3IIo5vJvuoDz6j/XWtlsZUtONKd3KeARz9vu61TRBz aNFyv/o1++WFNkC9Krs3VDmDZ7okofBE/Z39kMyGL/QaK8M8+jGpM2FAjHOQR3rZhf ev46rUvZZGD025/AhUCRbhXABDFOKgX/uDoYJQDHT0Y0M9qnNXKCVYybhP+SnleVyL 1dBmq4T6qBvUA== 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: 826a3167-fbd9-4ed3-8226-05f73e0968af X-Archives-Hash: 462ff7c594004426deea492df0401215 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/generic_stage_target.py | 6 ++++-- modules/snapshot_target.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/catalyst b/catalyst index 0fc65b0..131529a 100755 --- a/catalyst +++ b/catalyst @@ -68,6 +68,7 @@ def parse_config(myconfig): "portdir": "/usr/portage", "repo_name": "portage", "sharedir": "/usr/share/catalyst", + "snapshot_name": "portage-", "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", "storedir": "/var/tmp/catalyst", } diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 6ee35d2..63661fe 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 02b9831..ba1bab5 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): -- 1.8.3.2