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 477201388C1 for ; Tue, 15 Dec 2015 17:13:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAFE7E0856; Tue, 15 Dec 2015 17:13:15 +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 0F863E084D for ; Tue, 15 Dec 2015 17:13:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF09A34045C for ; Tue, 15 Dec 2015 17:13:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0B1ECAF for ; Tue, 15 Dec 2015 17:13:10 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1450199318.a0bcc3bda4f7528f91d610de712b29e83eaf3ec0.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a0bcc3bda4f7528f91d610de712b29e83eaf3ec0 X-VCS-Branch: master Date: Tue, 15 Dec 2015 17:13:10 +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: 75e85bc3-53b9-496d-97dd-1d7f5f7d3553 X-Archives-Hash: bdc2488cbe0db5cbf58fb44219f680a4 commit: a0bcc3bda4f7528f91d610de712b29e83eaf3ec0 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 15 16:51:43 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Tue Dec 15 17:08:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a0bcc3bd targets/livecd_stage1.py: Remove the duplicated set_target_path() catalyst/targets/livecd_stage1.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py index 70f9243..aa234b2 100644 --- a/catalyst/targets/livecd_stage1.py +++ b/catalyst/targets/livecd_stage1.py @@ -29,19 +29,6 @@ class livecd_stage1(StageBase): "bind","chroot_setup","setup_environment","build_packages",\ "unbind", "clean","clear_autoresume"] - def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) - if "autoresume" in self.settings["options"] \ - and self.resume.is_enabled("setup_target_path"): - log.notice('Resume point detected, skipping target path setup operation...') - else: - # first clean up any existing target stuff - if os.path.exists(self.settings["target_path"]): - cmd("rm -rf "+self.settings["target_path"],\ - "Could not remove existing directory: "+self.settings["target_path"],env=self.env) - self.resume.enable("setup_target_path") - ensure_dirs(self.settings["target_path"]) - def set_spec_prefix(self): self.settings["spec_prefix"]="livecd"