From: Brian Dolbec <dolsen@gentoo.org>
To: "gentoo-catalyst@lists.gentoo.org" <gentoo-catalyst@lists.gentoo.org>
Subject: [gentoo-catalyst] Catalyst tree move code changes. [2 of 4]
Date: Sun, 06 Jan 2013 17:43:39 -0800 [thread overview]
Message-ID: <1357523019.17120.11.camel@big_daddy.dol-sen.ca> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 101 bytes --]
use the new configured snapshot_name and portdir settings.
--
Brian Dolbec <dolsen@gentoo.org>
[-- Attachment #1.2: 0002-use-the-new-configured-snapshot-name-and-portdir-settings.patch --]
[-- Type: text/x-patch, Size: 2085 bytes --]
From ccbf4672257f461cd40a1cc8a47844dfd5dc0156 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Wed, 19 Dec 2012 18:08:50 -0800
Subject: [PATCH] use the new configured snapshot_name and portdir settings
---
modules/snapshot_target.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py
index 81ab083..8aa57fe 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"],
"Snapshot creation failure",env=self.env)
self.gen_contents_file(self.settings["snapshot_path"])
--
1.8.0
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
reply other threads:[~2013-01-07 2:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357523019.17120.11.camel@big_daddy.dol-sen.ca \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox