diff options
| -rw-r--r-- | catalyst/targets/generic_stage_target.py | 10 | ||||
| -rw-r--r-- | catalyst/targets/snapshot_target.py | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py index 1f26e65f..275416cb 100644 --- a/catalyst/targets/generic_stage_target.py +++ b/catalyst/targets/generic_stage_target.py @@ -1246,6 +1246,8 @@ class generic_stage_target(generic_target): else: """ Capture target in a tarball """ mypath=self.settings["target_path"].split("/") + """ Capture filename for use in label """ + filename=mypath[-1] """ Remove filename from path """ mypath=string.join(mypath[:-1],"/") @@ -1255,9 +1257,11 @@ class generic_stage_target(generic_target): print "Creating stage tarball..." - cmd("tar -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ - self.settings["stage_path"]+" .",\ - "Couldn't create stage tarball",env=self.env) + cmd("tar -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+ + self.settings["stage_path"]+" ." + + " --posix -V "+filename, + "Couldn't create stage tarball", + env=self.env) self.gen_contents_file(self.settings["target_path"]) self.gen_digest_file(self.settings["target_path"]) diff --git a/catalyst/targets/snapshot_target.py b/catalyst/targets/snapshot_target.py index d1b9e40c..845bc05f 100644 --- a/catalyst/targets/snapshot_target.py +++ b/catalyst/targets/snapshot_target.py @@ -52,9 +52,13 @@ class snapshot_target(generic_stage_target): self.settings["portdir"] + "/ " + mytmp + "/%s/" % self.settings["repo_name"], "Snapshot failure", env=self.env) + mypath=self.settings["snapshot_path"].split("/") + filename=mypath[-1] + print "Compressing Portage snapshot tarball..." cmd("tar -I lbzip2 -cf " + self.settings["snapshot_path"] + " -C " + - mytmp + " " + self.settings["repo_name"], + mytmp + " " + self.settings["repo_name"] + + " --posix -V "+filename, "Snapshot creation failure",env=self.env) self.gen_contents_file(self.settings["snapshot_path"]) |