[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/, catalyst/targets/

[Mike Frysinger]

commit:     d5fc0982052ada0eaab209b8c56574220f63a698
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 13:57:12 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 13:57:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d5fc0982

lint: convert funcs to @staticmethod where it makes sense

These functions don't actually utilize |self|, so make them into
@staticmethod's to quiet down the linter.

 catalyst/base/stagebase.py   | 3 ++-
 catalyst/lock.py             | 9 ++++++---
 catalyst/targets/snapshot.py | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b9dd1d5..409fcab 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1695,7 +1695,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
                                self.unbind()
                                raise CatalystError("build aborting due to 
livecd_update error.")
 
-       def _debug_pause_(self):
+       @staticmethod
+       def _debug_pause_():
                py_input("press any key to continue: ")
 
 # vim: ts=4 sw=4 sta et sts=4 ai

diff --git a/catalyst/lock.py b/catalyst/lock.py
index 71918d6..01b1aa8 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -320,7 +320,8 @@ class LockDir(object):
                        del self.hardlock_paths[self.lockdir]
                        print self.hardlock_paths
 
-       def hardlock_name(self, path):
+       @staticmethod
+       def hardlock_name(path):
                mypath=path+"/.hardlock-"+os.uname()[1]+"-"+str(os.getpid())
                newpath = os.path.normpath(mypath)
                if len(newpath) > 1:
@@ -328,7 +329,8 @@ class LockDir(object):
                                newpath = "/"+newpath.lstrip("/")
                return newpath
 
-       def hardlink_is_mine(self,link,lock):
+       @staticmethod
+       def hardlink_is_mine(link, lock):
                import stat
                try:
                        myhls = os.stat(link)
@@ -347,7 +349,8 @@ class LockDir(object):
                                return True
                return False
 
-       def hardlink_active(self, lock):
+       @staticmethod
+       def hardlink_active(lock):
                if not os.path.exists(lock):
                        return False
 

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index 87340b7..a117a21 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -90,7 +90,8 @@ class snapshot(TargetBase, GenBase):
        def kill_chroot_pids(self):
                pass
 
-       def cleanup(self):
+       @staticmethod
+       def cleanup():
                print "Cleaning up..."
 
        def purge(self):