commit: 080eab6b951ada8e6b982a71a4ff701241d7caee Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Thu Oct 8 19:33:17 2015 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Thu Oct 8 19:34:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=080eab6b
Fix argparse conversion breakage for verbose and debug settings Argparse always defines the target variable. Convert the use of them to normal assignment rather than a member inclusion test. catalyst/base/genbase.py | 6 +++--- catalyst/lock.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py index a163638..32459b4 100644 --- a/catalyst/base/genbase.py +++ b/catalyst/base/genbase.py @@ -26,7 +26,7 @@ class GenBase(object): array.sort() for j in array: contents = contents_map.contents(path, j, - verbose="VERBOSE" in self.settings) + verbose=self.settings["VERBOSE"]) if contents: myf.write(contents) myf.close() @@ -49,12 +49,12 @@ class GenBase(object): if "all" in array: for k in list(hash_map.hash_map): digest = hash_map.generate_hash(f,hash_=k, - verbose = "VERBOSE" in self.settings) + verbose=self.settings["VERBOSE"]) myf.write(digest) else: for j in array: digest = hash_map.generate_hash(f,hash_=j, - verbose = "VERBOSE" in self.settings) + verbose=self.settings["VERBOSE"]) myf.write(digest) myf.close() diff --git a/catalyst/lock.py b/catalyst/lock.py index 3d50c06..8095a82 100644 --- a/catalyst/lock.py +++ b/catalyst/lock.py @@ -71,7 +71,7 @@ class LockDir(object): def set_gid(self,gid): if not self.islocked(): -# if "DEBUG" in self.settings: +# if self.settings["DEBUG"]: # print "setting gid to", gid self.gid=gid @@ -83,7 +83,7 @@ class LockDir(object): if lockdir[-1] == "/": lockdir=lockdir[:-1] self.lockdir=normpath(lockdir) -# if "DEBUG" in self.settings: +# if self.settings["DEBUG"]: # print "setting lockdir to", self.lockdir else: raise "the lock object needs a path to a dir" @@ -91,13 +91,13 @@ class LockDir(object): def set_lockfilename(self,lockfilename): if not self.islocked(): self.lockfilename=lockfilename -# if "DEBUG" in self.settings: +# if self.settings["DEBUG"]: # print "setting lockfilename to", self.lockfilename def set_lockfile(self): if not self.islocked(): self.lockfile=normpath(self.lockdir+'/'+self.lockfilename) -# if "DEBUG" in self.settings: +# if self.settings["DEBUG"]: # print "setting lockfile to", self.lockfile def read_lock(self): @@ -222,7 +222,7 @@ class LockDir(object): os.unlink(self.lockfile) os.close(self.myfd) self.myfd=None -# if "DEBUG" in self.settings: +# if self.settings["DEBUG"]: # print "Unlinked lockfile..." except Exception, e: # We really don't care... Someone else has the lock. @@ -269,7 +269,7 @@ class LockDir(object): try: os.link(self.myhardlock, self.lockfile) except Exception: -# if "DEBUG" in self.settings: +# if self.settings["DEBUG"]: # print "lockfile(): Hardlink: Link failed." # print "Exception: ",e pass