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 2F98B138247 for ; Sat, 14 Dec 2013 22:25:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6128FE0B2E; Sat, 14 Dec 2013 22:24:48 +0000 (UTC) Received: from qmta10.westchester.pa.mail.comcast.net (qmta10.westchester.pa.mail.comcast.net [76.96.62.17]) by pigeon.gentoo.org (Postfix) with ESMTP id 59694E0AEB for ; Sat, 14 Dec 2013 22:24:46 +0000 (UTC) Received: from omta17.westchester.pa.mail.comcast.net ([76.96.62.89]) by qmta10.westchester.pa.mail.comcast.net with comcast id 1Zh81n0011vXlb85AaQl79; Sat, 14 Dec 2013 22:24:45 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta17.westchester.pa.mail.comcast.net with comcast id 1aQk1n00k152l3L3daQlRL; Sat, 14 Dec 2013 22:24:45 +0000 Received: by odin.tremily.us (Postfix, from userid 1000) id 46FA8D68B3E; Sat, 14 Dec 2013 14:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1387059884; bh=6uVnSN7yZtLqyJBWKKxCtoregNnIHq784JaUhFkaPo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=O39ccAOgqr7sDf52ZruOJkgT0mjkCUgDo8cMKCyzP1760WBKbHdrASBxFvLJL6M2T X3pHCPic9bE075m9j8/E++o00rUnfuGy3T2WGQB8T+KkD0144Z3wbfnh/3XJcg18+b Y0rSkecJ3KiSC9TBoMp+FaptWyHOpYcca2cqh8mA= From: "W. Trevor King" To: Catalyst Cc: Brian Dolbec , "W. Trevor King" Subject: [gentoo-catalyst] [PATCH v2 08/21] catalyst: Add 'snapshot_name' default Date: Sat, 14 Dec 2013 14:24:16 -0800 Message-Id: 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=wv41Gg/R6aU2h676Yvm+vsqkbQG3vakD7SiBCjS6a2s=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=tlA3VsW3o18Gh2BqLmE7N0lhgjsn6B113cKS4hA9kN6khe3Zx5zaRNarlRRasKQgy 4nKsVdJ2JA5Cy+8SIlebutvv8RuzfBXXh6aKWuSWyV/JM9b6Gewz2k/cYN6IiZQq8j fOtm/tpry14/oDqx302KrMXfqmiL0b21PhEpTmWqBsg9u+1vrybuzadTROPWwfl81u SaJmKcgV+Mk5HPE+r3W+w0aG8qfbO0lOJBZRznc4K12bFASmPHbHeXf/grShdeWSDt V/7j3simVXo+XoUoQAIupthhxjCk7hod71b166SO6b7YC2KIKO2VKfbLYrNUQySOwd topJcPIFxGSsw== 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: 9d99de57-87a6-41ec-8daa-00491d60ecb3 X-Archives-Hash: 6dd6aef648d487fa5bfd50618948c34d From: Brian Dolbec W. Trevor King: Refactored Git history for Brian Dolbec's content changes. Signed-off-by: W. Trevor King --- 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