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 C0D61138010 for ; Wed, 22 Aug 2012 18:02:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 531F2E071E for ; Wed, 22 Aug 2012 18:02:44 +0000 (UTC) Received: from mail-qc0-f181.google.com (mail-qc0-f181.google.com [209.85.216.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 7642AE051E for ; Wed, 22 Aug 2012 16:10:04 +0000 (UTC) Received: by qcpx40 with SMTP id x40so824165qcp.40 for ; Wed, 22 Aug 2012 09:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=rFgjxTgro4WWA25mpRExFeHBqSTPIFAHuCmisFhVd8I=; b=UbUxbqvPEspNijqgRXLDwEq5k/v+S5xiwYrN+MqT+6FZsM6WUZvIyMnfXEf+KCdEVE O5EVaesP99rwdj0FBnbD+M1GSRE3aQnf0+WJS1Ovw8/YY5mmmenzBprqagC8xEKGXffB BZWl/jIuDBzunkx/VG1J1F5TIyCy2AFgCEq3r5FiYbZgkFnOTz3K7Uaq1zEFv9pOqUsT i/O0quOJe925fBAY2+T7jtUEneHaqyyELkKOtayMx9XFEhIQ2isKnZDDeIs3nMQrQXXi Rs5NjqOiF1uxIkbGWg/vSdKfK9f/DjBWgqhkC3be0LTD+vsQeEeE5ktZjVMDIwXqe/h9 3Llg== Received: by 10.224.193.2 with SMTP id ds2mr11322485qab.37.1345651803531; Wed, 22 Aug 2012 09:10:03 -0700 (PDT) Received: from ozzie (pool-71-245-176-92.pitbpa.fios.verizon.net. [71.245.176.92]) by mx.google.com with ESMTPS id df2sm3443949qab.15.2012.08.22.09.10.01 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 09:10:02 -0700 (PDT) Received: by ozzie (sSMTP sendmail emulation); Wed, 22 Aug 2012 12:12:09 -0400 From: Rick Farina To: gentoo-catalyst@lists.gentoo.org Cc: Rick Farina Subject: [gentoo-catalyst] [PATCH] Support snapshot.tar.xz format Date: Wed, 22 Aug 2012 12:12:07 -0400 Message-Id: <1345651927-17587-1-git-send-email-sidhayn@gmail.com> X-Mailer: git-send-email 1.7.8.6 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: 29ecd667-e0dd-49be-b0be-86925791ba78 X-Archives-Hash: 5c0d470d37208b0f27a845fff050727e This patch adds in support for automatically detecting and decompressing both formats gentoo currently ships portage snapshots in. To make the change as minimal as possible I am using recent gnu/bsd tar ability to automatically pick the correct format and decompress. This should work on all gentoo supported platforms including linux, freebsd, and prefix-macosx. Signed-off-by: Rick Farina --- modules/generic_stage_target.py | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index c4ef239..b971741 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -404,12 +404,20 @@ 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.bz2") + "/snapshots/portage-"+self.settings["snapshot"]+".tar.xz") if os.path.exists(self.settings["snapshot_path"]): self.settings["snapshot_path_hash"]=\ generate_hash(self.settings["snapshot_path"],\ hash_function=self.settings["hash_function"],verbose=False) + else: + self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\ + "/snapshots/portage-"+self.settings["snapshot"]+".tar.bz2") + + if os.path.exists(self.settings["snapshot_path"]): + self.settings["snapshot_path_hash"]=\ + generate_hash(self.settings["snapshot_path"],\ + hash_function=self.settings["hash_function"],verbose=False) def set_snapcache_path(self): if self.settings.has_key("SNAPCACHE"): @@ -635,7 +643,7 @@ class generic_stage_target(generic_target): self.settings["source_path"]+"\nto "+\ self.settings["chroot_path"]+\ " (This may take some time) ...\n" - unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+\ self.settings["source_path"]+" to "+\ @@ -646,7 +654,7 @@ class generic_stage_target(generic_target): self.settings["source_path"]+"\nto "+\ self.settings["chroot_path"]+\ " (This may take some time) ...\n" - unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+self.settings["source_path"]+\ " to "+self.settings["chroot_path"]+" failed." @@ -744,7 +752,7 @@ class generic_stage_target(generic_target): read_from_clst(self.settings["snapshot_cache_path"]+\ "catalyst-hash") destdir=self.settings["snapshot_cache_path"] - unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+destdir unpack_errmsg="Error unpacking snapshot" cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ self.settings["snapshot_cache_path"]+\ @@ -760,7 +768,7 @@ class generic_stage_target(generic_target): cleanup_errmsg="Error removing existing snapshot directory." cleanup_msg=\ "Cleaning up existing portage tree (This can take a long time)..." - unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+\ + unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+\ self.settings["chroot_path"]+"/usr" unpack_errmsg="Error unpacking snapshot" -- 1.7.8.6