SOURCES: rpm.macros - coreutils 6.12 compatible %groupadd, see: http://li...

glen glen at pld-linux.org
Sun Sep 7 12:40:43 CEST 2008


Author: glen                         Date: Sun Sep  7 10:40:43 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- coreutils 6.12 compatible %groupadd, see:
  http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2008-August/020370.html

---- Files affected:
SOURCES:
   rpm.macros (1.478 -> 1.479) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.478 SOURCES/rpm.macros:1.479
--- SOURCES/rpm.macros:1.478	Sat Sep  6 23:55:02 2008
+++ SOURCES/rpm.macros	Sun Sep  7 12:40:37 2008
@@ -911,7 +911,7 @@
 %groupadd(g:P:rfo)	\
 %{!-g:%{error:groupadd: Required argument -g missing}} \
 %{!?1:%{error:groupadd: Required parameter group missing}} \
-if [ -n "`/usr/bin/getgid %{1}`" ]; then \
+if ! /usr/bin/getgid %{1} > /dev/null 2>&1; then \
 	if [ "`/usr/bin/getgid %{1}`" != "%{-g*}" ]; then \
 		echo "Error: group %{1} doesn't have gid=%{-g*}. Correct this before installing %{-P*}%{!?-P:%{name}}." 1>&2 \
 		exit 1 \
================================================================

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



More information about the pld-cvs-commit mailing list