sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[matter] rework ve_string_open_file_read parser method to return file path instead of handle

Browse Source
This commit is contained in:
Fabio Erculiani
2011-09-25 11:02:13 +02:00
parent ff6263f86f
commit f0ade6f50e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/matter
View File

@@ -245,7 +245,8 @@ class GenericSpecFunctions(object):
def ve_string_open_file_read(self, x):
try:
return open(x, "rb").read()
open(x, "rb").close()
return x
except (IOError, OSError):
return None
@@ -691,11 +692,11 @@ class PackageBuilder(object):
# run pkgpre, if any
pkgpre = self._params["pkgpre"]
if pkgpre is not None:
print_info(
"spawning pkgpre: %s, name: %s" % (pkgpre, pkgpre.name))
print_info("spawning --pkgpre: %s" % (pkgpre,))
tmp_fd, tmp_path = mkstemp()
with os.fdopen(tmp_fd, "wb") as tmp_f:
tmp_f.write(pkgpre)
with open(pkgpre, "rb") as pkgpre_f:
tmp_f.write(pkgpre_f.read())
try:
# now execute
os.chmod(tmp_path, 0o700)
@@ -717,11 +718,11 @@ class PackageBuilder(object):
# run pkgpost, if any
pkgpost = self._params["pkgpost"]
if pkgpost is not None:
print_info(
"spawning --pkgpost: %s, name: %s" % (pkgpost, pkgpost.name))
print_info("spawning --pkgpost: %s" % (pkgpost,))
tmp_fd, tmp_path = mkstemp()
with os.fdopen(tmp_fd, "wb") as tmp_f:
tmp_f.write(pkgpost)
with open(pkgpost, "rb") as pkgpost_f:
tmp_f.write(pkgpost_f.read())
try:
# now execute
os.chmod(tmp_path, 0o700)
@@ -1020,12 +1021,11 @@ class PackageBuilder(object):
"build")
buildfail = self._params['buildfail']
print_info(
"spawning buildfail: %s, name: %s" % (buildfail,
buildfail.name))
print_info("spawning buildfail: %s" % (buildfail,))
tmp_fd, tmp_path = mkstemp()
with os.fdopen(tmp_fd, "wb") as tmp_f:
tmp_f.write(buildfail)
with open(buildfail, "rb") as buildfail_f:
tmp_f.write(buildfail_f.read())
try:
# now execute
os.chmod(tmp_path, 0o700)