The read_from_clst function is used in one place, and this function is
an overwrought "read all the data from a file" function. Replace it
with a snakeoil function.
---
catalyst/base/stagebase.py | 7 +++----
catalyst/support.py | 15 ---------------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a2a8520..652dd9d 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -16,8 +16,7 @@ from DeComp.compress import CompressMap
from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS,
PORT_LOGDIR_CLEAN)
from catalyst.support import (CatalystError, msg, file_locate, normpath,
- cmd, warn, list_bashify, read_makeconf, read_from_clst, ismount,
- file_check)
+ cmd, warn, list_bashify, read_makeconf, ismount, file_check)
from catalyst.base.targetbase import TargetBase
from catalyst.base.clearbase import ClearBase
from catalyst.base.genbase import GenBase
@@ -816,8 +815,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "unpack(), target_portdir = " + target_portdir
if "snapcache" in self.settings["options"]:
snapshot_cache_hash=\
-
read_from_clst(self.settings["snapshot_cache_path"]+\
- "/" + "catalyst-hash")
+
fileutils.readfile(self.settings["snapshot_cache_path"]+\
+ "/" + "catalyst-hash", True)
unpack_info['mode'] = self.decompressor.determine_mode(
unpack_info['source'])
diff --git a/catalyst/support.py b/catalyst/support.py
index 960a91d..c629025 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -13,21 +13,6 @@ from catalyst.defaults import verbosity,
valid_config_file_values
BASH_BINARY = "/bin/bash"
-def read_from_clst(path):
- line = ''
- myline = ''
- try:
- myf = open(path, "r")
- except Exception:
- return -1
- #raise CatalystError("Could not open file " + path)
- for line in myf.readlines():
- #line = line.replace("\n", "") # drop newline
- myline = myline + line
- myf.close()
- return myline
-
-
def list_bashify(mylist):
if type(mylist)==types.StringType:
mypack=[mylist]
--
2.5.2
