[pve-devel] r4883 - pve-access-control/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-07-08 07:08:04 +0000 (Thu, 08 Jul 2010)
New Revision: 4883

Modified:
   pve-access-control/trunk/ChangeLog
   pve-access-control/trunk/pveum
Log:
      * pveum (print_usage): improve usage text.



Modified: pve-access-control/trunk/ChangeLog
===================================================================
--- pve-access-control/trunk/ChangeLog	2010-07-08 06:54:08 UTC (rev 4882)
+++ pve-access-control/trunk/ChangeLog	2010-07-08 07:08:04 UTC (rev 4883)
@@ -1,5 +1,7 @@
 2010-07-08  Proxmox Support Team  <support at proxmox.com>
 
+	* pveum (print_usage): improve usage text.
+
 	* AccessControl.pm: modify/delete ACL functionality
 
 	* pveum (aclmod): Add/Modify ACL

Modified: pve-access-control/trunk/pveum
===================================================================
--- pve-access-control/trunk/pveum	2010-07-08 06:54:08 UTC (rev 4882)
+++ pve-access-control/trunk/pveum	2010-07-08 07:08:04 UTC (rev 4883)
@@ -31,7 +31,11 @@
     my $msg = shift;
 
     print STDERR "ERROR: $msg\n" if $msg;
-    print STDERR "USAGE: pveum <COMMAND> [OPTIONS]\n";
+    print STDERR "pveum <COMMAND> [OPTIONS]\n";
+    print STDERR "pveum aclmod [OPTIONS] <PATH> <USER|GROUP> <ROLE>\n";
+    print STDERR "\t--propagate\tset propagate flag\n";
+    print STDERR "pveum acldel [OPTIONS] <PATH> <USER|GROUP> <ROLE>\n";
+    print STDERR "\n";
 }
 
 if (!scalar (@ARGV)) {
@@ -188,8 +192,8 @@
     my $uglist = shift;
     my $rolelist = shift;
 
-    print_usage("syntax error\nUsage: pveum aclmod /vm testuser,\@testgroup admin") if
-	!$pathtxt && !$rolelist && !$uglist;
+    print_usage("syntax error") 
+	if !$pathtxt && !$rolelist && !$uglist;
 
     PVE::AccessControl::modify_acl($pathtxt, $uglist, $rolelist, $opts);
 
@@ -202,10 +206,12 @@
     my $pathtxt = shift;
     my $uglist = shift;
     my $rolelist = shift;
+
     $opts->{delete} = 1;
-    print_usage("syntax error\nUsage: pveum acldel /vm testuser,\@testgroup admin") if
-	!$pathtxt && !$rolelist && !$uglist;
 
+    print_usage("syntax error") 
+	if !$pathtxt && !$rolelist && !$uglist;
+
     PVE::AccessControl::modify_acl($pathtxt, $uglist, $rolelist, $opts);
 
     exit(0);