rpms/quota/F-9 quota-3.15-helpoption.patch, NONE, 1.1 quota.spec, 1.41, 1.42

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/quota/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12791

Modified Files:
	quota.spec 
Added Files:
	quota-3.15-helpoption.patch 
Log Message:
Add support for -h option (do not show invalid option error) at edquota,setquota and quota (#457898)

quota-3.15-helpoption.patch:

--- NEW FILE quota-3.15-helpoption.patch ---
diff -urNp quota-tools-orig/edquota.c quota-tools/edquota.c
--- quota-tools-orig/edquota.c	2006-10-30 16:26:20.000000000 +0100
+++ quota-tools/edquota.c	2008-08-05 14:19:02.000000000 +0200
@@ -127,9 +127,9 @@ int parse_options(int argc, char **argv)
 
 	quotatype = USRQUOTA;
 #if defined(RPC_SETQUOTA)
-	while ((ret = getopt_long(argc, argv, "ugrntTVp:F:f:", long_opts, NULL)) != -1) {
+	while ((ret = getopt_long(argc, argv, "ughrntTVp:F:f:", long_opts, NULL)) != -1) {
 #else
-	while ((ret = getopt_long(argc, argv, "ugtTVp:F:f:", long_opts, NULL)) != -1) {
+	while ((ret = getopt_long(argc, argv, "ughtTVp:F:f:", long_opts, NULL)) != -1) {
 #endif
 		switch (ret) {
 		  case 'p':
@@ -166,6 +166,7 @@ int parse_options(int argc, char **argv)
 		  case 'V':
 			  version();
 			  exit(0);
+		  case 'h':
 		  default:
 			  usage();
 		}
diff -urNp quota-tools-orig/quota.c quota-tools/quota.c
--- quota-tools-orig/quota.c	2007-06-20 18:22:23.000000000 +0200
+++ quota-tools/quota.c	2008-08-05 14:18:22.000000000 +0200
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
 	gettexton();
 	progname = basename(argv[0]);
 
-	while ((ret = getopt_long(argc, argv, "guqvsVliQF:wfAp", long_opts, NULL)) != -1) {
+	while ((ret = getopt_long(argc, argv, "ghuqvsVliQF:wfAp", long_opts, NULL)) != -1) {
 		switch (ret) {
 		  case 'g':
 			  flags |= FL_GROUP;
@@ -311,6 +311,7 @@ int main(int argc, char **argv)
 		  case 'V':
 			  version();
 			  exit(0);
+		  case 'h':
 		  default:
 			  usage();
 		}
diff -urNp quota-tools-orig/setquota.c quota-tools/setquota.c
--- quota-tools-orig/setquota.c	2006-05-13 03:05:24.000000000 +0200
+++ quota-tools/setquota.c	2008-08-05 14:19:52.000000000 +0200
@@ -102,9 +102,9 @@ static void parse_options(int argcnt, ch
 	char *protoname = NULL;
 
 #ifdef RPC_SETQUOTA
-	char *opts = "gp:urVF:taTb";
+	char *opts = "ghp:urVF:taTb";
 #else
-	char *opts = "gp:uVF:taTb";
+	char *opts = "ghp:uVF:taTb";
 #endif
 	struct option long_opts[] = {
 		{ "user", 0, NULL, 'u' },


Index: quota.spec
===================================================================
RCS file: /cvs/extras/rpms/quota/F-9/quota.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- quota.spec	12 Mar 2008 12:53:04 -0000	1.41
+++ quota.spec	5 Aug 2008 12:26:09 -0000	1.42
@@ -5,7 +5,7 @@
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.15
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -20,7 +20,7 @@
 Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
 Patch5: quota-3.15-manpages.patch
-
+Patch6: quota-3.15-helpoption.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -37,6 +37,7 @@
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
@@ -89,6 +90,10 @@
 
 
 %changelog
+* Tue Aug 05 2008 Ondrej Vasik <ovasik at redhat.com> 3.15-7
+- Add support for -h option (do not show invalid option
+  error) at edquota,setquota and quota (#457898)
+
 * Wed Mar 12 2008 Ondrej Vasik <ovasik at redhat.com> 3.15-6
 - added enable-ldapmail=try option(wonder how #133207
   got closed by FC-4 without it or warnquota.conf change)