SOURCES: rpm.macros - verbose shells adding - arg[2] is integer no...

glen glen at pld-linux.org
Sun Feb 10 13:59:52 CET 2008


Author: glen                         Date: Sun Feb 10 12:59:52 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- verbose shells adding
- arg[2] is integer not string (!?) in lua

---- Files affected:
SOURCES:
   rpm.macros (1.428 -> 1.429) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.428 SOURCES/rpm.macros:1.429
--- SOURCES/rpm.macros:1.428	Sun Feb 10 13:44:19 2008
+++ SOURCES/rpm.macros	Sun Feb 10 13:59:47 2008
@@ -1414,13 +1414,14 @@
 end\
 for _, s in ipairs({%{expand:%%__lua_split %*}}) do\
 	if not t[s] then\
+		print("Adding "..s.." to /etc/shells")\
 		f = io.open("/etc/shells", "a"); f:write(s.."\\n"); f:close()\
 	end\
 end\
 %{nil}
 
 %remove_etc_shells(p) %{-p:<lua>}\
-%{-p:if arg[2] == "0" then}\
+%{-p:if arg[2] == 0 then}\
 	t = {}\
 	f = io.open("/etc/shells", "r")\
 	if f then\
@@ -1428,6 +1429,7 @@
 		f:close()\
 	end\
 	for _, l in pairs({%{expand:%%__lua_split %*}}) do\
+		print("Removing "..l.." from /etc/shells")\
 		t[l] = nil\
 	end\
 	s=""\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.428&r2=1.429&f=u



More information about the pld-cvs-commit mailing list