[packages/rpm-build-macros] - close only if f is valid
arekm
arekm at pld-linux.org
Sat Jul 6 21:38:39 CEST 2013
commit d2c9cab9154c0f8e2d953d65cbf162848f30b27d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Jul 6 21:38:36 2013 +0200
- close only if f is valid
rpm-build-macros.spec | 2 +-
rpm.macros | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 5faf722..bfb1d2f 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
%if "%{pld_release}" == "ac"
%define with_rpm4 1
%endif
-%define rpm_macros_rev 1.667
+%define rpm_macros_rev 1.668
%define find_lang_rev 1.36
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index d4a3fd4..8064a61 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1608,8 +1608,8 @@ fi \
f = io.open("%{_docdir}/%{name}-%{version}/optional-packages.txt", "r") \
if f then \
for l in f:lines() do print(l); end \
+ f.close() \
end \
-f:close() \
%{nil}
@@ -1989,7 +1989,11 @@ s=""\
for _, l in pairs(t) do\
s=s..l.."\\n"\
end\
-f = io.open("/etc/shells", "w"); f:write(s); f:close()\
+f = io.open("/etc/shells", "w")\
+if f then\
+ write(s)\
+ f:close()\
+end\
%{nil}
# Backwards compat. Use of %lua_ prefixed macros is preferred as these are cleaner to read.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/d2c9cab9154c0f8e2d953d65cbf162848f30b27d
More information about the pld-cvs-commit
mailing list