Move catalyst_lock.py to catalyst/lock.py and update references

diff --git a/ChangeLog b/ChangeLog
index d8e2325e771fdf12d5d9a96fba4e4d9e377f956a..f5b343577c9b89ffb2616514c9198a57fe0926eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  +modules/catalyst/lock.py,
+  modules/catalyst/target/generic_stage_target.py,
+  -modules/catalyst_lock.py:
+  Move catalyst_lock.py to catalyst/lock.py and update references
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
   modules/catalyst/target/__init__.py,
   modules/catalyst/target/generic_stage_target.py:

diff --git a/modules/catalyst_lock.py b/modules/catalyst/lock.py
similarity index 100%
rename from modules/catalyst_lock.py
rename to modules/catalyst/lock.py

diff --git a/modules/catalyst/target/generic_stage_target.py b/modules/catalyst/target/generic_stage_target.py
index 76ce57d930f91ff6d0a7c0369fda92e2c87a80cd..4db1d70b5d08a48eeeb50d7bec0b62a9b6619b3a 100644 (file)
--- a/modules/catalyst/target/generic_stage_target.py
+++ b/modules/catalyst/target/generic_stage_target.py
@@ -8,7 +8,7 @@ import os,string,imp,types,shutil
 from catalyst_support import *
 from generic_target import *
 from stat import *
-import catalyst_lock
+import catalyst.lock
 import catalyst.arch
 
 class generic_stage_target(generic_target):
@@ -400,7 +400,7 @@ class generic_stage_target(generic_target):
                                normpath(self.settings["snapshot_cache"]+"/"+\
                                self.settings["snapshot"]+"/")
                        self.snapcache_lock=\
-                               catalyst_lock.LockDir(self.settings["snapshot_cache_path"])
+                               catalyst.lock.LockDir(self.settings["snapshot_cache_path"])
                        print "Caching snapshot to "+self.settings["snapshot_cache_path"]
 
        def set_chroot_path(self):
@@ -410,7 +410,7 @@ class generic_stage_target(generic_target):
                """
                self.settings["chroot_path"]=normpath(self.settings["storedir"]+\
                        "/tmp/"+self.settings["target_subpath"]+"/")
-               self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"])
+               self.chroot_lock=catalyst.lock.LockDir(self.settings["chroot_path"])
 
        def set_autoresume_path(self):
                self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\