From 57ca011e1cd2681948969724e2646edaac22da28 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 13 Oct 2011 17:24:48 +0200
Subject: [PATCH] Rename utils.mlock to utils.cfunc
Renaming so that more code using ctypes could be added to the same file.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
Makefile.am | 4 ++--
lib/utils/__init__.py | 2 +-
lib/utils/{mlock.py => cfunc.py} | 0
...utils.mlock_unittest.py => ganeti.utils.cfunc_unittest.py} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename lib/utils/{mlock.py => cfunc.py} (100%)
rename test/{ganeti.utils.mlock_unittest.py => ganeti.utils.cfunc_unittest.py} (100%)
diff --git a/Makefile.am b/Makefile.am
index 98d8a4f9e..2a513f15f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -273,11 +273,11 @@ pytools_PYTHON = \
utils_PYTHON = \
lib/utils/__init__.py \
lib/utils/algo.py \
+ lib/utils/cfunc.py \
lib/utils/filelock.py \
lib/utils/hash.py \
lib/utils/io.py \
lib/utils/log.py \
- lib/utils/mlock.py \
lib/utils/nodesetup.py \
lib/utils/process.py \
lib/utils/retry.py \
@@ -724,11 +724,11 @@ python_tests = \
test/ganeti.tools.ensure_dirs_unittest.py \
test/ganeti.uidpool_unittest.py \
test/ganeti.utils.algo_unittest.py \
+ test/ganeti.utils.cfunc_unittest.py \
test/ganeti.utils.filelock_unittest.py \
test/ganeti.utils.hash_unittest.py \
test/ganeti.utils.io_unittest.py \
test/ganeti.utils.log_unittest.py \
- test/ganeti.utils.mlock_unittest.py \
test/ganeti.utils.nodesetup_unittest.py \
test/ganeti.utils.process_unittest.py \
test/ganeti.utils.retry_unittest.py \
diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py
index 9f7cb24e1..5d332ab3f 100644
--- a/lib/utils/__init__.py
+++ b/lib/utils/__init__.py
@@ -43,11 +43,11 @@ from ganeti import constants
from ganeti import compat
from ganeti.utils.algo import *
+from ganeti.utils.cfunc import *
from ganeti.utils.filelock import *
from ganeti.utils.hash import *
from ganeti.utils.io import *
from ganeti.utils.log import *
-from ganeti.utils.mlock import *
from ganeti.utils.nodesetup import *
from ganeti.utils.process import *
from ganeti.utils.retry import *
diff --git a/lib/utils/mlock.py b/lib/utils/cfunc.py
similarity index 100%
rename from lib/utils/mlock.py
rename to lib/utils/cfunc.py
diff --git a/test/ganeti.utils.mlock_unittest.py b/test/ganeti.utils.cfunc_unittest.py
similarity index 100%
rename from test/ganeti.utils.mlock_unittest.py
rename to test/ganeti.utils.cfunc_unittest.py
--
GitLab