[Pkg-shadow-commits] r1363 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-17 14:49:39 +0000 (Sat, 17 Nov 2007)
New Revision: 1363

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
Use the same error message for the below errors.
(option working ONLY if another is specified).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-17 14:40:54 UTC (rev 1362)
+++ upstream/trunk/ChangeLog	2007-11-17 14:49:39 UTC (rev 1363)
@@ -1,5 +1,10 @@
 2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/usermod.c: Use the same error message for the below errors.
+	(option working ONLY if another is specified).
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/usermod.c: Make usermod -o and -u work independently of the
 	argument order.
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2007-11-17 14:40:54 UTC (rev 1362)
+++ upstream/trunk/src/usermod.c	2007-11-17 14:49:39 UTC (rev 1363)
@@ -1038,8 +1038,8 @@
 
 	if (aflg && (!Gflg)) {
 		fprintf (stderr,
-			 _("%s: -a flag is ONLY allowed with the -G flag\n"),
-			 Prog);
+			 _("%s: %s flag is ONLY allowed with the %s flag\n"),
+			 Prog, "-a", "-G");
 		usage ();
 		exit (E_USAGE);
 	}
@@ -1054,16 +1054,16 @@
 
 	if (oflg && !uflg) {
 		fprintf (stderr,
-			 _("%s: -o flag is ONLY allowed with the -u flag\n"),
-			 Prog);
+			 _("%s: %s flag is ONLY allowed with the %s flag\n"),
+			 Prog, "-o", "-u");
 		usage ();
 		exit (E_USAGE);
 	}
 
 	if (mflg && !dflg) {
 		fprintf (stderr,
-			 _("%s: -m flag is ONLY allowed with the -d flag\n"),
-			 Prog);
+			 _("%s: %s flag is ONLY allowed with the %s flag\n"),
+			 Prog, "-m", "-d");
 		usage ();
 		exit (E_USAGE);
 	}