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 E860C138A87 for ; Thu, 26 Feb 2015 19:25:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85A52E09B7; Thu, 26 Feb 2015 19:25:40 +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 1E332E09B7 for ; Thu, 26 Feb 2015 19:25:40 +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 8FA2B340B68 for ; Thu, 26 Feb 2015 19:25:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0381129D2 for ; Thu, 26 Feb 2015 19:25:31 +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: <1424978120.5c79385fc2a02d4e539ef5fe646397da98f72bde.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/base/ catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5c79385fc2a02d4e539ef5fe646397da98f72bde X-VCS-Branch: pending Date: Thu, 26 Feb 2015 19:25:31 +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: 448de721-27b3-471c-80be-58acf5313749 X-Archives-Hash: 3ea2c95ec3ecb4471a9d27990fec2f62 commit: 5c79385fc2a02d4e539ef5fe646397da98f72bde Author: Brian Dolbec gentoo org> AuthorDate: Sat Jun 1 07:31:59 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:20 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5c79385f Rename local unpack var to _unpack The method name was unpack, so rename the local var to _unpack to help avoid confusion. --- catalyst/base/stagebase.py | 18 +++++++++--------- catalyst/targets/livecd_stage2.py | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index f8443d8..bdeaedd 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -662,7 +662,7 @@ class StageBase(TargetBase, ClearBase, GenBase): raise CatalystError("Unable to auto-unbind " + target) def unpack(self): - unpack=True + _unpack=True clst_unpack_hash = self.resume.get("unpack") @@ -712,49 +712,49 @@ class StageBase(TargetBase, ClearBase, GenBase): if os.path.isdir(self.settings["source_path"]) \ and self.resume.is_enabled("unpack"): """ Autoresume is valid, SEEDCACHE is valid """ - unpack=False + _unpack=False invalid_snapshot=False elif os.path.isfile(self.settings["source_path"]) \ and self.settings["source_path_hash"]==clst_unpack_hash: """ Autoresume is valid, tarball is valid """ - unpack=False + _unpack=False invalid_snapshot=True elif os.path.isdir(self.settings["source_path"]) \ and self.resume.is_disabled("unpack"): """ Autoresume is invalid, SEEDCACHE """ - unpack=True + _unpack=True invalid_snapshot=False elif os.path.isfile(self.settings["source_path"]) \ and self.settings["source_path_hash"]!=clst_unpack_hash: """ Autoresume is invalid, tarball """ - unpack=True + _unpack=True invalid_snapshot=True else: """ No autoresume, SEEDCACHE """ if "seedcache" in self.settings["options"]: """ SEEDCACHE so let's run rsync and let it clean up """ if os.path.isdir(self.settings["source_path"]): - unpack=True + _unpack=True invalid_snapshot=False elif os.path.isfile(self.settings["source_path"]): """ Tarball so unpack and remove anything already there """ - unpack=True + _unpack=True invalid_snapshot=True """ No autoresume, no SEEDCACHE """ else: """ Tarball so unpack and remove anything already there """ if os.path.isfile(self.settings["source_path"]): - unpack=True + _unpack=True invalid_snapshot=True elif os.path.isdir(self.settings["source_path"]): """ We should never reach this, so something is very wrong """ raise CatalystError( "source path is a dir but seedcache is not enabled") - if unpack: + if _unpack: self.mount_safety_check() if invalid_snapshot: diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 38b6884..45a6767 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -86,7 +86,7 @@ class livecd_stage2(StageBase): myf.close() def unpack(self): - unpack=True + _unpack=True display_msg=None clst_unpack_hash = self.resume.get("unpack") @@ -102,12 +102,12 @@ class livecd_stage2(StageBase): if os.path.isdir(self.settings["source_path"]) and \ self.resume.is_enabled("unpack"): print "Resume point detected, skipping unpack operation..." - unpack=False + _unpack=False elif "source_path_hash" in self.settings: if self.settings["source_path_hash"] != clst_unpack_hash: invalid_snapshot=True - if unpack: + if _unpack: self.mount_safety_check() if invalid_snapshot: print "No Valid Resume point detected, cleaning up ..." 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 E14A9138ADA for ; Thu, 26 Feb 2015 20:13:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC850E0934; Thu, 26 Feb 2015 20:13:04 +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 73043E0934 for ; Thu, 26 Feb 2015 20:12:59 +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 F32EC340C3A for ; Thu, 26 Feb 2015 20:12:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCE87129E3 for ; Thu, 26 Feb 2015 20:12:43 +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: <1424978120.5c79385fc2a02d4e539ef5fe646397da98f72bde.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 5c79385fc2a02d4e539ef5fe646397da98f72bde X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12:43 +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: 1f4bcac9-ebfc-4659-87f7-f2746b937140 X-Archives-Hash: 2e9525450a6162bde3fd11012bcc319e Message-ID: <20150226201243.Rr7pN-mqHFQ5z71MqBTqOnOmTH6TekbzpdBlPFMwwl4@z> commit: 5c79385fc2a02d4e539ef5fe646397da98f72bde Author: Brian Dolbec gentoo org> AuthorDate: Sat Jun 1 07:31:59 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:20 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5c79385f Rename local unpack var to _unpack The method name was unpack, so rename the local var to _unpack to help avoid confusion. --- catalyst/base/stagebase.py | 18 +++++++++--------- catalyst/targets/livecd_stage2.py | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index f8443d8..bdeaedd 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -662,7 +662,7 @@ class StageBase(TargetBase, ClearBase, GenBase): raise CatalystError("Unable to auto-unbind " + target) def unpack(self): - unpack=True + _unpack=True clst_unpack_hash = self.resume.get("unpack") @@ -712,49 +712,49 @@ class StageBase(TargetBase, ClearBase, GenBase): if os.path.isdir(self.settings["source_path"]) \ and self.resume.is_enabled("unpack"): """ Autoresume is valid, SEEDCACHE is valid """ - unpack=False + _unpack=False invalid_snapshot=False elif os.path.isfile(self.settings["source_path"]) \ and self.settings["source_path_hash"]==clst_unpack_hash: """ Autoresume is valid, tarball is valid """ - unpack=False + _unpack=False invalid_snapshot=True elif os.path.isdir(self.settings["source_path"]) \ and self.resume.is_disabled("unpack"): """ Autoresume is invalid, SEEDCACHE """ - unpack=True + _unpack=True invalid_snapshot=False elif os.path.isfile(self.settings["source_path"]) \ and self.settings["source_path_hash"]!=clst_unpack_hash: """ Autoresume is invalid, tarball """ - unpack=True + _unpack=True invalid_snapshot=True else: """ No autoresume, SEEDCACHE """ if "seedcache" in self.settings["options"]: """ SEEDCACHE so let's run rsync and let it clean up """ if os.path.isdir(self.settings["source_path"]): - unpack=True + _unpack=True invalid_snapshot=False elif os.path.isfile(self.settings["source_path"]): """ Tarball so unpack and remove anything already there """ - unpack=True + _unpack=True invalid_snapshot=True """ No autoresume, no SEEDCACHE """ else: """ Tarball so unpack and remove anything already there """ if os.path.isfile(self.settings["source_path"]): - unpack=True + _unpack=True invalid_snapshot=True elif os.path.isdir(self.settings["source_path"]): """ We should never reach this, so something is very wrong """ raise CatalystError( "source path is a dir but seedcache is not enabled") - if unpack: + if _unpack: self.mount_safety_check() if invalid_snapshot: diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 38b6884..45a6767 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -86,7 +86,7 @@ class livecd_stage2(StageBase): myf.close() def unpack(self): - unpack=True + _unpack=True display_msg=None clst_unpack_hash = self.resume.get("unpack") @@ -102,12 +102,12 @@ class livecd_stage2(StageBase): if os.path.isdir(self.settings["source_path"]) and \ self.resume.is_enabled("unpack"): print "Resume point detected, skipping unpack operation..." - unpack=False + _unpack=False elif "source_path_hash" in self.settings: if self.settings["source_path_hash"] != clst_unpack_hash: invalid_snapshot=True - if unpack: + if _unpack: self.mount_safety_check() if invalid_snapshot: print "No Valid Resume point detected, cleaning up ..."