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 4F4211393F1 for ; Tue, 15 Sep 2015 21:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 915CAE085A; Tue, 15 Sep 2015 21:48:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33303E085A for ; Tue, 15 Sep 2015 21:48:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 370923409B7 for ; Tue, 15 Sep 2015 21:48:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AE9418B for ; Tue, 15 Sep 2015 21:48:00 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1442353692.b2d0e8091b6335cb5c830b2493ffbdfa21b4692b.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: b2d0e8091b6335cb5c830b2493ffbdfa21b4692b X-VCS-Branch: master Date: Tue, 15 Sep 2015 21:48:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 53af67e0-7182-4483-b9f5-3d2180af5320 X-Archives-Hash: c07c8050c111d3154768a9ed189615bd commit: b2d0e8091b6335cb5c830b2493ffbdfa21b4692b Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Sep 15 21:48:12 2015 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Sep 15 21:48:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2d0e809 remove duplicated unpack from livecd-stage2 catalyst/targets/livecd_stage2.py | 48 --------------------------------------- 1 file changed, 48 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index e5ca074..70f0fac 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -85,54 +85,6 @@ class livecd_stage2(StageBase): myf.write("\nblacklist "+x) myf.close() - def unpack(self): - _unpack=True - display_msg=None - - clst_unpack_hash = self.resume.get("unpack") - - if os.path.isdir(self.settings["source_path"]): - unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] - display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." - invalid_snapshot=False - - if "autoresume" in self.settings["options"]: - if os.path.isdir(self.settings["source_path"]) and \ - self.resume.is_enabled("unpack"): - print "Resume point detected, skipping unpack operation..." - _unpack=False - elif "source_path_hash" in self.settings: - if self.settings["source_path_hash"] != clst_unpack_hash: - invalid_snapshot=True - - if _unpack: - self.mount_safety_check() - if invalid_snapshot: - print "No Valid Resume point detected, cleaning up ..." - self.clear_autoresume() - self.clear_chroot() - - ensure_dirs(self.settings["chroot_path"]+"/tmp", mode=1777) - - if "pkgcache" in self.settings["options"]: - ensure_dirs(self.settings["pkgcache_path"], mode=0755) - - if not display_msg: - raise CatalystError("Could not find appropriate source.\n" - "Please check the 'source_subpath' " - "setting in the spec file.", - print_traceback=True) - - print display_msg - cmd(unpack_cmd,error_msg,env=self.env) - - if "source_path_hash" in self.settings: - self.resume.enable("unpack", data=self.settings["source_path_hash"]) - else: - self.resume.enable("unpack") - def set_action_sequence(self): self.settings["action_sequence"]=["unpack","unpack_snapshot",\ "config_profile_link","setup_confdir","portage_overlay",\