From eece84481a75eb2e5fe46c72ee14195531a8295b Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 10 Jan 2009 20:17:53 -0600 Subject: [PATCH] Move catalyst_lock.py to catalyst/lock.py and update references --- ChangeLog | 6 ++++++ modules/{catalyst_lock.py => catalyst/lock.py} | 0 modules/catalyst/target/generic_stage_target.py | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) rename modules/{catalyst_lock.py => catalyst/lock.py} (100%) diff --git a/ChangeLog b/ChangeLog index d8e2325e..f5b34357 100644 --- 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 + +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 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 76ce57d9..4db1d70b 100644 --- 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"]+\ -- 2.26.2