- %remove_etc_shells with -p skips code if upgraded

Changed files:
    rpm.macros -> 1.428

diff --git a/rpm.macros b/rpm.macros
index 03f9d5d275a7335f6309e62a1bfb4e7cf0c5a61b..5a97446b7e9b499da1cc50d9e8e01cd5ecbadd90 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1420,20 +1420,22 @@ end\
 %{nil}
 
 %remove_etc_shells(p) %{-p:<lua>}\
-t = {}\
-f = io.open("/etc/shells", "r")\
-if f then\
-       for l in f:lines() do t[l]=l; end\
-       f:close()\
-end\
-for _, l in pairs({%{expand:%%__lua_split %*}}) do\
-       t[l] = nil\
-end\
-s=""\
-for _, l in pairs(t) do\
-       s=s..l.."\\n"\
-end\
-io.open("/etc/shells", "w"):write(s)\
+%{-p:if arg[2] == "0" then}\
+       t = {}\
+       f = io.open("/etc/shells", "r")\
+       if f then\
+               for l in f:lines() do t[l]=l; end\
+               f:close()\
+       end\
+       for _, l in pairs({%{expand:%%__lua_split %*}}) do\
+               t[l] = nil\
+       end\
+       s=""\
+       for _, l in pairs(t) do\
+               s=s..l.."\\n"\
+       end\
+       io.open("/etc/shells", "w"):write(s)\
+%{-p:end} \
 %{nil}
 
 # vim:ts=4 sw=4 noet syn=spec