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 0FB411384B4 for ; Tue, 15 Dec 2015 17:13:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7426E0863; 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 1B568E0852 for ; Tue, 15 Dec 2015 17:13:15 +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 E773A3405D5 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 5B500B04 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: <1449247196.00c77c332fe93ca295ca1ac7a20f7b317d4936a7.dolsen@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: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 00c77c332fe93ca295ca1ac7a20f7b317d4936a7 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: 43bb2d41-2452-496e-97f0-25ef2b5bbb2c X-Archives-Hash: 267d404f81556a0cd768f1967f6e34bd commit: 00c77c332fe93ca295ca1ac7a20f7b317d4936a7 Author: Brian Dolbec gentoo org> AuthorDate: Fri Dec 4 16:39:26 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Dec 4 16:39:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=00c77c33 targets/livecd-stage2.py: Remove the set_source_path() This is not needed and overrides the stagebase method which handles the auto-extension. catalyst/targets/livecd_stage2.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 7d9919b..ed5aafa 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -36,19 +36,6 @@ class livecd_stage2(StageBase): file_locate(self.settings, ["cdtar","controller_file"]) - def set_source_path(self): - self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]) - if os.path.isfile(self.settings["source_path"]): - self.settings["source_path_hash"] = \ - self.settings["hash_map"].generate_hash( - self.settings["source_path"]) - else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]) - if not os.path.exists(self.settings["source_path"]): - raise CatalystError("Source Path: " + - self.settings["source_path"] + " does not exist.", - print_traceback=True) - def set_spec_prefix(self): self.settings["spec_prefix"]="livecd"