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 2F2B9138010 for ; Wed, 22 Aug 2012 03:03:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7F8BE0733 for ; Wed, 22 Aug 2012 03:03:35 +0000 (UTC) Received: from mail-iy0-f181.google.com (mail-iy0-f181.google.com [209.85.210.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 2CE37E0512 for ; Wed, 22 Aug 2012 00:56:53 +0000 (UTC) Received: by iagw33 with SMTP id w33so359813iag.40 for ; Tue, 21 Aug 2012 17:56:53 -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=oce1HXuLMAcm/OTG493MfG8gzxMN1yy2OgkT6Mh+/Qw=; b=yC2uNbmaFT08E+wH9RpoOiTTbdY7whTInXnjYZvBBr2r3+uRhLqNbN8n/vn4Fziudj hCtyV3m2bnKyjRnrT98h210TSdcvl2E00XuE/HXU73pzTzMZVkr/vuewn8aTHzp/fZ70 RcE+ZdLY2D8ZnO2dJQ4A0hPFHhr0T5ohLFyLtpI2nTfAG4Rimy1KIPwst7hgWfrluwvw ztFQ7bXn9s9uSv0x0sd0d6Ovub5mvPwlVgpLPbXCgJrv6WyWEAzByaDGmX7uGw3+NM/T UyGvOVAQIlULC8Hpn/5CJb/WMxqU+amQZOeSIiLGtIYWmF+z69kdexPfw9ARPIznmZrq qXBw== Received: by 10.42.119.76 with SMTP id a12mr15699221icr.2.1345597013228; Tue, 21 Aug 2012 17:56:53 -0700 (PDT) Received: from ozzie (239.sub-75-201-224.myvzw.com. [75.201.224.239]) by mx.google.com with ESMTPS id q1sm5805586igj.15.2012.08.21.17.56.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 17:56:52 -0700 (PDT) Received: by ozzie (sSMTP sendmail emulation); Tue, 21 Aug 2012 20:58:49 -0400 From: Rick Farina To: gentoo-catalyst@lists.gentoo.org Cc: Rick Farina Subject: [gentoo-catalyst] [PATCH] Support snapshot.tar.xz Date: Tue, 21 Aug 2012 20:58:44 -0400 Message-Id: <1345597124-28151-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: 6b1d5d18-1a30-4fa6-a926-c413df7ddcf0 X-Archives-Hash: b4facdda65dd79ba54f772bd781597df 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 tar ability to automatically pick the correct format and decompress. This may not work as expected on *bsd or MacOSX unless we already require gnu tar on those platforms. Signed-off-by: Rick Farina --- modules/generic_stage_target.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index c4ef239..031d8bf 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -404,12 +404,15 @@ 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") def set_snapcache_path(self): if self.settings.has_key("SNAPCACHE"): @@ -635,7 +638,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 +649,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 +747,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 +763,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